diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:37:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:37:25 +0000 |
| commit | 048957e46f49c8938f290e9de6f6cf517b962fa7 (patch) | |
| tree | 8918fdd7e7a75ff103bbba6f4b292a642a540d62 /lib | |
| parent | 678a668da15ab16bbcdf45d61ee32eb20b58d47f (diff) | |
| download | iurt-048957e46f49c8938f290e9de6f6cf517b962fa7.tar iurt-048957e46f49c8938f290e9de6f6cf517b962fa7.tar.gz iurt-048957e46f49c8938f290e9de6f6cf517b962fa7.tar.bz2 iurt-048957e46f49c8938f290e9de6f6cf517b962fa7.tar.xz iurt-048957e46f49c8938f290e9de6f6cf517b962fa7.zip | |
(clean_process) kill unused arg
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Iurt/Process.pm | 4 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm index accd636..f69e4ca 100644 --- a/lib/Iurt/Process.pm +++ b/lib/Iurt/Process.pm @@ -228,7 +228,7 @@ sub perform_command { if ($kill && $opt{type} ne 'shell') { $comment = "Command killed after $opt{timeout}s: $command\n"; my ($cmd_to_kill) = $command =~ /sudo(?: chroot \S+)? (.*)/; - clean_process($run, $cmd_to_kill, $run->{verbose}); + clean_process($cmd_to_kill, $run->{verbose}); } elsif ($pipe) { $comment = "Command received SIGPIPE: $command\n"; sendmail($config->{admin}, '' , @@ -308,7 +308,7 @@ sub perform_command { } sub clean_process { - my ($run, $match, $verbose) = @_; + my ($match, $verbose) = @_; return clean($match, "pgrep -u root -f", "$sudo pkill -9 -u root -f", $verbose); } diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 0556ce0..a380bd5 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -542,7 +542,7 @@ sub install_packages { }, )) { plog('DEBUG', "urpmi command failed."); - if (!clean_process($run, "$self->{urpmi_command} @to_install", $run->{verbose})) { + if (!clean_process("$self->{urpmi_command} @to_install", $run->{verbose})) { dump_cache_par($run); die "FATAL $program_name: Could not have urpmi working !"; } @@ -567,7 +567,7 @@ sub clean_urpmi_process { my $program_name = $run->{program_name}; if (!$run->{chrooted_urpmi}) { my $match = $self->{urpmi_command} or return; - if (!clean_process($run, $match, $run->{verbose})) { + if (!clean_process($match, $run->{verbose})) { dump_cache_par($run); die "FATAL $program_name: Could not have urpmi working !"; } |