diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-09-09 02:45:40 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-09-09 02:45:40 +0000 |
| commit | 29063091ad4cd16685bfabc8e48ade00329ec20b (patch) | |
| tree | 09cc5b78e334c322d51a10de216121131af4b839 | |
| parent | f9f67da951cddf7554ab10fafe11f71fbd1b66e9 (diff) | |
| download | drakx-29063091ad4cd16685bfabc8e48ade00329ec20b.tar drakx-29063091ad4cd16685bfabc8e48ade00329ec20b.tar.gz drakx-29063091ad4cd16685bfabc8e48ade00329ec20b.tar.bz2 drakx-29063091ad4cd16685bfabc8e48ade00329ec20b.tar.xz drakx-29063091ad4cd16685bfabc8e48ade00329ec20b.zip | |
rename $str into $real_name
| -rw-r--r-- | perl-install/run_program.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index c237d7214..6ab67f9ff 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -41,13 +41,13 @@ sub rooted { sub raw { my ($options, $name, @args) = @_; my $root = $options->{root} || ''; - my $str = ref($name) ? $name->[0] : $name; + my $real_name = ref($name) ? $name->[0] : $name; my ($stdout_raw, $stdout_mode, $stderr_raw, $stderr_mode); ($stdout_mode, $stdout_raw, @args) = @args if $args[0] =~ /^>>?$/; ($stderr_mode, $stderr_raw, @args) = @args if $args[0] =~ /^2>>?$/; - log::l("running: $str @args" . ($root ? " with root $root" : "")); + log::l("running: $real_name @args" . ($root ? " with root $root" : "")); return 1 if $root && $<; @@ -79,7 +79,7 @@ sub raw { alarm 0; }; if ($@) { - log::l("ERROR: killing runaway process (process=$str, pid=$pid, args=@args, error=$@)"); + log::l("ERROR: killing runaway process (process=$real_name, pid=$pid, args=@args, error=$@)"); kill 9, $pid; return; } @@ -126,7 +126,7 @@ sub raw { exec $name, @args; }; if (!$ok) { - log::l("exec of $str failed: $!"); + log::l("exec of $real_name failed: $!"); c::_exit(128); } } |