From 8a866499d5a6474a6711267f38f4556fee8c7837 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 9 Jul 2008 19:08:01 +0000 Subject: merge diff with parallel_ssh --- urpm/parallel_ka_run.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index e2930f1d..e88e3a1b 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -59,10 +59,10 @@ sub parallel_find_remove { 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 node have it. + #- if other nodes have it. @notfound{split ", ", $1} = (); } elsif (/The following packages contain ([^:]*): (.*)/) { - $options{callback_fuzzy} && $options{callback_fuzzy}->($urpm, $1, split " ", $2) + $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; -- cgit v1.2.1