diff options
| -rw-r--r-- | urpm/parallel_ka_run.pm | 2 | ||||
| -rw-r--r-- | urpm/parallel_ssh.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 2 | ||||
| -rw-r--r-- | urpmi.spec | 7 |
4 files changed, 10 insertions, 3 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 9aa74497..90a14f98 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -187,7 +187,7 @@ sub parallel_install { /^\s*$/ and next; $bad_nodes{$node} .= $_; /Installation failed/ and $bad_nodes{$node} = ''; - /Installation is possible|everything already installed/ and delete $bad_nodes{$node}; + /Installation is possible/ and delete $bad_nodes{$node}; } close F or $urpm->{fatal}(1, _("rshp failed, maybe a node is unreacheable")); diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index daebd70e..64bbbfdc 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -193,7 +193,7 @@ sub parallel_install { while ($_ = <F>) { $bad_nodes{$node} .= $_; /Installation failed/ and $bad_nodes{$node} = ''; - /Installation is possible|everything already installed/ and delete $bad_nodes{$node}, last; + /Installation is possible/ and delete $bad_nodes{$node}, last; } close F; } @@ -626,6 +626,8 @@ if (%sources_install || %sources) { } } } +} elsif ($test) { + message(_("Installation is possible")); } else { $verbose >= 0 and message(_("Everything already installed"), $auto); } @@ -2,7 +2,7 @@ Name: urpmi Version: 4.2 -Release: 20mdk +Release: 21mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -206,6 +206,11 @@ fi %changelog +* Thu Feb 20 2003 François Pons <fpons@mandrakesoft.com> 4.2-21mdk +- modified --test output to be consistent about the same + message displayed if installation is possible whatever + verbosity (fixed bug 1955). + * Thu Feb 20 2003 François Pons <fpons@mandrakesoft.com> 4.2-20mdk - fixed bug 1737 and 1816. |