summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 10:42:01 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 10:42:01 +0000
commit798e3fcf8b44f7e32645fd7d831e413e52424f7f (patch)
tree57b43d6376b6907260e20bf14ff0e4c955c26951
parent325b18931384a3d360da9c52fea973af763b98bd (diff)
downloadurpmi-798e3fcf8b44f7e32645fd7d831e413e52424f7f.tar
urpmi-798e3fcf8b44f7e32645fd7d831e413e52424f7f.tar.gz
urpmi-798e3fcf8b44f7e32645fd7d831e413e52424f7f.tar.bz2
urpmi-798e3fcf8b44f7e32645fd7d831e413e52424f7f.tar.xz
urpmi-798e3fcf8b44f7e32645fd7d831e413e52424f7f.zip
Be backwards compatible with older versions of urpme
-rw-r--r--urpm/parallel_ka_run.pm2
-rw-r--r--urpm/parallel_ssh.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index 1220b392..bbb5d3c0 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -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 (/Removal failed/) {
+ } elsif (/Remov(?:al|ing) failed/) {
$bad_nodes{$node} = [];
} else {
if (exists $bad_nodes{$node}) {
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index 190baa25..b8681c86 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 (/Removal failed/) {
+ } elsif (/Remov(?:al|ing) failed/) {
$bad_nodes{$node} = [];
} else {
if (exists $bad_nodes{$node}) {