summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-07-29 12:57:12 +0000
committerFrancois Pons <fpons@mandriva.com>2003-07-29 12:57:12 +0000
commitd0ae38ff4d6ec1343cfc8a5cfea238f287f35b51 (patch)
tree38b17d2384e6d9b12b207209ab7e69f9c05f223e
parent57fb249a9c4ab02405793a226b84821165984b92 (diff)
downloadurpmi-d0ae38ff4d6ec1343cfc8a5cfea238f287f35b51.tar
urpmi-d0ae38ff4d6ec1343cfc8a5cfea238f287f35b51.tar.gz
urpmi-d0ae38ff4d6ec1343cfc8a5cfea238f287f35b51.tar.bz2
urpmi-d0ae38ff4d6ec1343cfc8a5cfea238f287f35b51.tar.xz
urpmi-d0ae38ff4d6ec1343cfc8a5cfea238f287f35b51.zip
fix for urpme log recently added.
-rw-r--r--urpm/parallel_ka_run.pm4
-rw-r--r--urpm/parallel_ssh.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index d8aa59f7..03dcc1e4 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -52,11 +52,13 @@ sub parallel_find_remove {
or delete $state->{rejected}, last;
} elsif (/removing package (.*) will break your system/) {
$base_to_remove{$1} = undef;
+ } elsif (/removing \S/) {
+ #- this is log for newer urpme, so do not try to remove removing...
} elsif (/Removing failed/) {
$bad_nodes{$node} = [];
} else {
if (exists $bad_nodes{$node}) {
- /^\s+(.*)/ and push @{$bad_nodes{$node}}, $1;
+ /^\s+(.+)/ and push @{$bad_nodes{$node}}, $1;
} else {
$state->{rejected}{$_}{removed} = 1;
$state->{rejected}{$_}{nodes}{$node} = undef;
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index a9da4a0c..98414ee1 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -55,6 +55,8 @@ sub parallel_find_remove {
or delete $state->{rejected}, last;
} elsif (/removing package (.*) will break your system/) {
$base_to_remove{$1} = undef;
+ } elsif (/removing \S/) {
+ #- this is log for newer urpme, so do not try to remove removing...
} elsif (/Removing failed/) {
$bad_nodes{$node} = [];
} else {