summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 17:51:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 17:51:36 +0000
commit186d1cfd88ce0e894d4252a7638866e014de52c3 (patch)
treed6fa19bdce72a116e8f60a6a5ee297b03703389c
parent42af38c6116db65d3065d172c3a474f650ddd7f1 (diff)
downloadurpmi-186d1cfd88ce0e894d4252a7638866e014de52c3.tar
urpmi-186d1cfd88ce0e894d4252a7638866e014de52c3.tar.gz
urpmi-186d1cfd88ce0e894d4252a7638866e014de52c3.tar.bz2
urpmi-186d1cfd88ce0e894d4252a7638866e014de52c3.tar.xz
urpmi-186d1cfd88ce0e894d4252a7638866e014de52c3.zip
o fix --parallel --auto-select when one box is up-to-date but not the others (#41924)
-rw-r--r--NEWS1
-rw-r--r--urpm/parallel.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9e8bbac0..549bd190 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@
o handle README.urpmi in utf8 (but not other encodings) (#41553)
o handle --debug-librpm
o fix --parallel on local media (ie when synthesis.cz is not copied to /var/lib/urpmi)
+ o fix --parallel --auto-select when one box is up-to-date but not the others (#41924)
- urpmi.addmedia:
o make --mirrorlist with no url equivalent to --mirrorlist '$MIRRORLIST' (#40283)
o --interactive: fix selecting "noauto" media (#39522)
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index 4c44c55d..28eb1c9a 100644
--- a/urpm/parallel.pm
+++ b/urpm/parallel.pm
@@ -283,7 +283,7 @@ sub parallel_install {
$s =~ /^\s*$/ and return;
$bad_nodes{$node} .= "$s\n";
$s =~ /Installation failed/ and $bad_nodes{$node} = '';
- $s =~ /Installation is possible/ and push @good_nodes, $node;
+ $s =~ /Installation is possible|Packages are up to date/ and push @good_nodes, $node;
undef;
});
delete $bad_nodes{$_} foreach @good_nodes;