diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-11-17 10:41:09 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-11-17 10:41:09 +0000 |
| commit | 325b18931384a3d360da9c52fea973af763b98bd (patch) | |
| tree | 1935dd5829b5e4e0237179fd0173fd58a1f3cdeb /urpm | |
| parent | 61613e53183dab147039955a6b70cb73fb39bc0c (diff) | |
| download | urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.gz urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.bz2 urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.xz urpmi-325b18931384a3d360da9c52fea973af763b98bd.zip | |
Add comments in urpme about messages that should not be changed.
But change a message badly worded.
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/parallel_ka_run.pm | 4 | ||||
| -rw-r--r-- | urpm/parallel_ssh.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 2c060c47..1220b392 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -49,7 +49,7 @@ sub parallel_find_remove { /^\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, ("node %s has bad version of urpme, please upgrade", $node)); + and $urpm->{fatal}(1, urpm::N("node %s has an old version of urpme, please upgrade", $node)); if (/unknown packages?:? (.*)/) { #- keep in mind unknown package from the node, because it should not be a fatal error #- if other node have it. @@ -61,7 +61,7 @@ sub parallel_find_remove { $base_to_remove{$1} = undef; } elsif (/removing \S/) { #- this is log for newer urpme, so do not try to remove removing... - } elsif (/Removing failed/) { + } elsif (/Removal failed/) { $bad_nodes{$node} = []; } else { if (exists $bad_nodes{$node}) { diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index 088804c6..190baa25 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -74,7 +74,7 @@ sub parallel_find_remove { $base_to_remove{$1} = undef; } elsif (/removing \S/) { #- this is log for newer urpme, so do not try to remove removing... - } elsif (/Removing failed/) { + } elsif (/Removal failed/) { $bad_nodes{$node} = []; } else { if (exists $bad_nodes{$node}) { |