diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-03-03 10:17:22 +0100 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-03-03 10:17:22 +0100 |
| commit | 53eb7b79c5f2d08a2fff52c5f217a66587239bfb (patch) | |
| tree | 98316f391e131aa6ce3b3b6003b0b0ed381024e4 /lib/SlackBuild/Rc.pm | |
| parent | 7c4be643873e0191db7f59811669eb0b4791ca2f (diff) | |
| download | slackbuilder-53eb7b79c5f2d08a2fff52c5f217a66587239bfb.tar.gz slackbuilder-53eb7b79c5f2d08a2fff52c5f217a66587239bfb.tar.bz2 | |
Fix prerequisite matching.
* lib/SlackBuild/Rc.pm (resolv): Unless architecture is given explicitly,
match either the builder architecture or 'noarch'.
* lib/SlackBuild/Registry/Backend/FS.pm (architectures): Add 'noarch'.
* lib/SlackBuild/Archive/Extractor/HTTP.pm (extract): Force 644 mode
on the created files. Perhaps this should be configurable.
Diffstat (limited to 'lib/SlackBuild/Rc.pm')
| -rw-r--r-- | lib/SlackBuild/Rc.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/SlackBuild/Rc.pm b/lib/SlackBuild/Rc.pm index 1e85032..6129a6c 100644 --- a/lib/SlackBuild/Rc.pm +++ b/lib/SlackBuild/Rc.pm @@ -24,7 +24,8 @@ sub resolve { } else { $name = $pkg; } - $q{arch} = $self->builder->arch unless exists $q{arch}; + $q{arch} = { -in => [ $self->builder->arch, 'noarch' ] } + unless exists $q{arch}; if (my $rec = $reg->lookup($name, %q)) { push @packages, $rec->filename; } else { |