summaryrefslogtreecommitdiffstats
path: root/tools/install-xml-file-list
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-04-28 17:30:09 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-04-28 23:14:58 +0200
commitaa8f011bc60bdf7741534a8ca3c06ddbba5a90c8 (patch)
tree48e98ea540b00174dbc579704dc9d2d5dc89260c /tools/install-xml-file-list
parent7f320442488287d9ff76479648aefc985646366f (diff)
downloaddrakx-aa8f011bc60bdf7741534a8ca3c06ddbba5a90c8.tar
drakx-aa8f011bc60bdf7741534a8ca3c06ddbba5a90c8.tar.gz
drakx-aa8f011bc60bdf7741534a8ca3c06ddbba5a90c8.tar.bz2
drakx-aa8f011bc60bdf7741534a8ca3c06ddbba5a90c8.tar.xz
drakx-aa8f011bc60bdf7741534a8ca3c06ddbba5a90c8.zip
supplement blacklist
Diffstat (limited to 'tools/install-xml-file-list')
-rwxr-xr-xtools/install-xml-file-list6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list
index b5413a1ab..6d6f84c0b 100755
--- a/tools/install-xml-file-list
+++ b/tools/install-xml-file-list
@@ -92,7 +92,7 @@ sub valid_cond {
sub add_to_env {
my ($env, $tag, $attr) = @_;
- my %env = map_each { $::a => +{%$::b} } %$env;
+ my %env = map_each { $::a => +{ %$::b } } %$env;
foreach (keys %$attr) {
!$env{$tag}{$_} or die qq(overriding attribute <$tag $_="$env{$tag}{$_}"> with $_="$attr->{$_}"\n);
$env{$tag}{$_} = $attr->{$_};
@@ -260,8 +260,8 @@ sub install {
} elsif ($expand eq 'binary') {
$disallow_from_dir->();
my @PATH = qw(/usr/sbin /usr/bin /usr/X11R6/bin);
- unshift(@PATH, "/bin") unless ( -l "/bin" );
- unshift(@PATH, "/sbin") unless ( -l "/sbin" );
+ unshift(@PATH, "/bin") unless -l "/bin";
+ unshift(@PATH, "/sbin") unless -l "/sbin";
foreach my $name (map { expand_macros($_) } @text_l) {
my @l = grep { -x $_ } map { "$_/$name" } @PATH;
@l or error("can't find binary $name"), next;