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 @@ -55,16 +55,15 @@ sub lookup { my ($self, $pkg, %cond) = @_; my $v; 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 || '')) { $d } elsif ($d = $b->version <=> $a->version) { $d 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 @@ -44,15 +44,18 @@ sub store { my $self = shift; croak "store not implemented"; } 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'); } sub cmp { my ($self, $other) = @_; diff --git a/slackbuilder b/slackbuilder index bf4c081..bf4c081 100644..100755 --- a/slackbuilder +++ b/slackbuilder |