summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-13 16:12:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-13 16:12:30 +0000
commit52c5848740fdbe25ba697c53a84346f0e606ce06 (patch)
treec7e2836310e320c1b7daa4686d2e2c4d9f02354c
parent1e39829f1eaff95dab8fcee820317b2e95047506 (diff)
downloadurpmi-52c5848740fdbe25ba697c53a84346f0e606ce06.tar
urpmi-52c5848740fdbe25ba697c53a84346f0e606ce06.tar.gz
urpmi-52c5848740fdbe25ba697c53a84346f0e606ce06.tar.bz2
urpmi-52c5848740fdbe25ba697c53a84346f0e606ce06.tar.xz
urpmi-52c5848740fdbe25ba697c53a84346f0e606ce06.zip
fix error when introducing _update_medium_first_pass: there was a "redo MEDIA", so it's not a function call, it must be return after redoing
-rw-r--r--urpm.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 5690ccc6..33bf83b3 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1283,7 +1283,7 @@ sub _update_medium_first_pass {
if (!$medium_redone && !$medium->{noreconfigure}) {
my $reconfig_urpmi = reduce_pathname("$dir/reconfig.urpmi");
if (-s $reconfig_urpmi && $urpm->reconfig_urpmi($reconfig_urpmi, $medium->{name})) {
- _update_medium_first_pass($urpm, $medium, $second_pass, $clean_cache, 'redo', %options);
+ return _update_medium_first_pass($urpm, $medium, $second_pass, $clean_cache, 'redo', %options);
}
}
@@ -1476,7 +1476,7 @@ this could happen if you mounted manually the directory when creating the medium
};
if (-s $reconfig_urpmi && $urpm->reconfig_urpmi($reconfig_urpmi, $medium->{name})) {
if (!$medium_redone) {
- _update_medium_first_pass($urpm, $medium, $second_pass, $clean_cache, 'redo', %options);
+ return _update_medium_first_pass($urpm, $medium, $second_pass, $clean_cache, 'redo', %options);
}
}
unlink $reconfig_urpmi;