diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-10 19:08:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-10 19:08:16 +0000 |
| commit | e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe (patch) | |
| tree | 330a25c5aaae867b51b827038bed95ce5b2b376a | |
| parent | 786963a4d4034f3a9cd6985899512644e6cc8359 (diff) | |
| download | urpmi-e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe.tar urpmi-e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe.tar.gz urpmi-e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe.tar.bz2 urpmi-e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe.tar.xz urpmi-e4a6e69522ce8f9d4e943cdc59a94d5341d18cbe.zip | |
- urpmi
o fix --parallel --auto-select when one box is up-to-date but not the others (#41924)
(backported from trunk)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm/parallel_ka_run.pm | 2 | ||||
| -rw-r--r-- | urpm/parallel_ssh.pm | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ - urpmi o fix displaying "files are missing" (regression introduced in 5.6) + o fix --parallel --auto-select when one box is up-to-date but not the others (#41924) Version 5.19 - 3 April 2008, by Pascal "Pixel" Rigaux diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index a41500e4..fff6546f 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -231,7 +231,7 @@ sub parallel_install { /^\s*$/ and next; $bad_nodes{$node} .= $_; /Installation failed/ and $bad_nodes{$node} = ''; - /Installation is possible/ and delete $bad_nodes{$node}; + /Installation is possible|Packages are up to date/ and delete $bad_nodes{$node}; } close $fh or $urpm->{fatal}(1, urpm::N("rshp failed, maybe a node is unreacheable")); diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index 69c93264..3ea3917d 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -246,7 +246,7 @@ sub parallel_install { while ($_ = <$fh>) { $bad_nodes{$node} .= $_; /Installation failed/ and $bad_nodes{$node} = ''; - /Installation is possible/ and delete $bad_nodes{$node}, last; + /Installation is possible|Packages are up to date/ and delete $bad_nodes{$node}, last; } close $fh; } |