diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-04-12 12:13:56 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-04-12 12:13:56 +0200 |
commit | c7377b5c67997f3c75d3fe3dc115bfd70fffe4e9 (patch) | |
tree | ef738ceb1d6582ac93cb1f98cf53e2b1a23149c2 | |
parent | 53eb7b79c5f2d08a2fff52c5f217a66587239bfb (diff) | |
download | slackbuilder-c7377b5c67997f3c75d3fe3dc115bfd70fffe4e9.tar.gz slackbuilder-c7377b5c67997f3c75d3fe3dc115bfd70fffe4e9.tar.bz2 |
Minor fix
-rw-r--r-- | lib/SlackBuild/Registry/Backend/FS.pm | 3 | ||||
-rw-r--r-- | lib/SlackBuild/Registry/Record.pm | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | slackbuilder | 0 |
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 { | |||
58 | my $pat = "$pkg-*-*-*"; | 58 | my $pat = "$pkg-*-*-*"; |
59 | 59 | ||
60 | my $rx = '^' . qr($pkg) . '-' | 60 | my $rx = '^' . qr($pkg) . '-' |
61 | . '(?<version>\d+(\.\d+)+.*?)-(?<arch>' | 61 | . '(?<version>\d+(?:\.\d+)*.*?)-(?<arch>' |
62 | . regexp_opt(@architectures) | 62 | . regexp_opt(@architectures) |
63 | .= ')-(?<build>\d+)(?<rest>.*)$'; | 63 | .= ')-(?<build>\d+)(?<rest>.*)$'; |
64 | |||
65 | my @result = sort { | 64 | my @result = sort { |
66 | my $d; | 65 | my $d; |
67 | if ($d = ($a->package || '') cmp ($b->package || '')) { | 66 | 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 { | |||
47 | 47 | ||
48 | sub as_string { | 48 | sub as_string { |
49 | my $self = shift; | 49 | my $self = shift; |
50 | use Data::Dumper; | ||
51 | local $Data::Dumper::Indent = 0; | ||
52 | local $Data::Dumper::Terse = 1; | ||
50 | return $self->package . '-' | 53 | return $self->package . '-' |
51 | . ($self->version || '*') . '-' | 54 | . ($self->version ? Dumper($self->version) : '*') . '-' |
52 | . ($self->arch || '*') . '-' | 55 | . ($self->arch ? Dumper($self->arch) : '*') . '-' |
53 | . ($self->build || '1'); | 56 | . ($self->build || '1'); |
54 | } | 57 | } |
55 | 58 | ||
diff --git a/slackbuilder b/slackbuilder index bf4c081..bf4c081 100644..100755 --- a/slackbuilder +++ b/slackbuilder | |||