diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 19:08:01 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 19:08:01 +0000 |
| commit | 8a866499d5a6474a6711267f38f4556fee8c7837 (patch) | |
| tree | 6289c25eecdfe24b11a81d55d974fa7ab73d0597 | |
| parent | 39de3cffa1b798ba536af02f3c1211f98dc676a7 (diff) | |
| download | urpmi-8a866499d5a6474a6711267f38f4556fee8c7837.tar urpmi-8a866499d5a6474a6711267f38f4556fee8c7837.tar.gz urpmi-8a866499d5a6474a6711267f38f4556fee8c7837.tar.bz2 urpmi-8a866499d5a6474a6711267f38f4556fee8c7837.tar.xz urpmi-8a866499d5a6474a6711267f38f4556fee8c7837.zip | |
merge diff with parallel_ssh
| -rw-r--r-- | urpm/parallel_ka_run.pm | 4 |
1 files 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; |