diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:23 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-24 15:54:23 +0000 |
| commit | 71ac20f49f46bcc39c0060dbaabdcae34da02f38 (patch) | |
| tree | c68a2ff80d62b4f8609e11ded730995e4ff6f554 /lib | |
| parent | 073beb0a309e58c8feb5fb67e1a9bd1fd2e78df0 (diff) | |
| download | iurt-71ac20f49f46bcc39c0060dbaabdcae34da02f38.tar iurt-71ac20f49f46bcc39c0060dbaabdcae34da02f38.tar.gz iurt-71ac20f49f46bcc39c0060dbaabdcae34da02f38.tar.bz2 iurt-71ac20f49f46bcc39c0060dbaabdcae34da02f38.tar.xz iurt-71ac20f49f46bcc39c0060dbaabdcae34da02f38.zip | |
(clean_process) kill newly 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 0099829..29d3262 100644 --- a/lib/Iurt/Process.pm +++ b/lib/Iurt/Process.pm @@ -227,7 +227,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($cmd_to_kill, $run->{verbose}); + clean_process($cmd_to_kill); } elsif ($pipe) { $comment = "Command received SIGPIPE: $command\n"; sendmail($config->{admin}, '' , @@ -307,7 +307,7 @@ sub perform_command { } sub clean_process { - my ($match, $verbose) = @_; + my ($match) = @_; return clean($match, "pgrep -u root -f", "$sudo pkill -9 -u root -f"); } diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 797698e..36fe903 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -541,7 +541,7 @@ sub install_packages { }, )) { plog('DEBUG', "urpmi command failed."); - if (!clean_process("$self->{urpmi_command} @to_install", $run->{verbose})) { + if (!clean_process("$self->{urpmi_command} @to_install")) { dump_cache_par($run); die "FATAL $program_name: Could not have urpmi working !"; } @@ -566,7 +566,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($match, $run->{verbose})) { + if (!clean_process($match)) { dump_cache_par($run); die "FATAL $program_name: Could not have urpmi working !"; } |