summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-10-07 16:36:14 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-10-07 16:36:14 +0000
commit4f817f66ccf2058fb7f0d236934db8a708ca331e (patch)
tree7b47d11ddfa7920239243abbd323e235a8ac6f50
parent7e1cf22e89eb8e56bd4066de53f3cd1344f559dc (diff)
downloaddrakx-4f817f66ccf2058fb7f0d236934db8a708ca331e.tar
drakx-4f817f66ccf2058fb7f0d236934db8a708ca331e.tar.gz
drakx-4f817f66ccf2058fb7f0d236934db8a708ca331e.tar.bz2
drakx-4f817f66ccf2058fb7f0d236934db8a708ca331e.tar.xz
drakx-4f817f66ccf2058fb7f0d236934db8a708ca331e.zip
fix previous commit so that "prog1|prog2" like construction still work
-rw-r--r--perl-install/run_program.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index 0e6ede3b4..7e6e94368 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -63,7 +63,8 @@ sub raw {
my $stdout = $stdout_raw && (ref($stdout_raw) ? $tmpdir->() . "/.drakx-stdout.$$" : "$root$stdout_raw");
my $stderr = $stderr_raw && (ref($stderr_raw) ? $tmpdir->() . "/.drakx-stderr.$$" : "$root$stderr_raw");
- if (! ($real_name =~ m!^/! ? -x $real_name : whereis_binary($real_name, $root))) {
+ my ($rname) = split(/[ \|]/, $real_name, 2);
+ if (! ($rname =~ m!^/! ? -x $rname : whereis_binary($rname, $root))) {
log::l("program not found: $real_name");
return;
}