diff options
Diffstat (limited to 'urpm/parallel_ssh.pm')
| -rw-r--r-- | urpm/parallel_ssh.pm | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index a21c3f32..453a4cfe 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -55,33 +55,9 @@ sub parallel_find_remove { or $urpm->{fatal}(1, "Can't fork ssh: $!"); local $_; while (defined ($_ = <$fh>)) { - chomp; - /^\s*$/ and next; - /Checking to remove the following packages/ and next; - /To satisfy dependencies, the following packages are going to be removed/ - and $urpm->{fatal}(1, N("node %s has an old version of urpme, please upgrade", $node)); - if (/unknown packages?:? (.*)/) { - #- remember unknown packages from the node, because it should not be a fatal error - #- if other nodes have it. - @notfound{split ", ", $1} = (); - } elsif (/The following packages contain ([^:]*): (.*)/) { - $options{callback_fuzzy} && $options{callback_fuzzy}->($urpm, $1, split(" ", $2)) - or delete $state->{rejected}, last; - } elsif (/removing package (.*) will break your system/) { - $base_to_remove{$1} = undef; - } elsif (/removing \S/) { - #- this is log for newer urpme, so do not try to remove removing... - } elsif (/Remov(?:al|ing) failed/) { - $bad_nodes{$node} = []; - } else { - if (exists $bad_nodes{$node}) { - /^\s+(.+)/ and push @{$bad_nodes{$node}}, $1; - } else { - s/\s*\(.*//; #- remove reason (too complex to handle, needs to be removed) - $state->{rejected}{$_}{removed} = 1; - $state->{rejected}{$_}{nodes}{$node} = undef; - } - } + urpm::parallel::parse_urpme_output($urpm, $state, $node, $_, + \%notfound, \%base_to_remove, \%bad_nodes, %options) + or last; } close $fh; } |