summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2018-04-12 10:13:56 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2018-04-12 10:13:56 (GMT)
commitc7377b5c67997f3c75d3fe3dc115bfd70fffe4e9 (patch) (side-by-side diff)
treeef738ceb1d6582ac93cb1f98cf53e2b1a23149c2
parent53eb7b79c5f2d08a2fff52c5f217a66587239bfb (diff)
downloadslackbuilder-c7377b5c67997f3c75d3fe3dc115bfd70fffe4e9.tar.gz
slackbuilder-c7377b5c67997f3c75d3fe3dc115bfd70fffe4e9.tar.bz2
Minor fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/SlackBuild/Registry/Backend/FS.pm3
-rw-r--r--lib/SlackBuild/Registry/Record.pm7
-rwxr-xr-x[-rw-r--r--]slackbuilder0
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/SlackBuild/Registry/Backend/FS.pm b/lib/SlackBuild/Registry/Backend/FS.pm
index 9d84370..5788ead 100644
--- a/lib/SlackBuild/Registry/Backend/FS.pm
+++ b/lib/SlackBuild/Registry/Backend/FS.pm
@@ -58,10 +58,9 @@ sub lookup {
my $pat = "$pkg-*-*-*";
my $rx = '^' . qr($pkg) . '-'
- . '(?<version>\d+(\.\d+)+.*?)-(?<arch>'
+ . '(?<version>\d+(?:\.\d+)*.*?)-(?<arch>'
. regexp_opt(@architectures)
.= ')-(?<build>\d+)(?<rest>.*)$';
-
my @result = sort {
my $d;
if ($d = ($a->package || '') cmp ($b->package || '')) {
diff --git a/lib/SlackBuild/Registry/Record.pm b/lib/SlackBuild/Registry/Record.pm
index 22c6a3c..130dd16 100644
--- a/lib/SlackBuild/Registry/Record.pm
+++ b/lib/SlackBuild/Registry/Record.pm
@@ -47,9 +47,12 @@ sub store {
sub as_string {
my $self = shift;
+ use Data::Dumper;
+ local $Data::Dumper::Indent = 0;
+ local $Data::Dumper::Terse = 1;
return $self->package . '-'
- . ($self->version || '*') . '-'
- . ($self->arch || '*') . '-'
+ . ($self->version ? Dumper($self->version) : '*') . '-'
+ . ($self->arch ? Dumper($self->arch) : '*') . '-'
. ($self->build || '1');
}
diff --git a/slackbuilder b/slackbuilder
index bf4c081..bf4c081 100644..100755
--- a/slackbuilder
+++ b/slackbuilder

Return to:

Send suggestions and report system problems to the System administrator.