summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-15 16:42:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-15 16:42:42 +0000
commit64e3fcb670476ce5f5dea3f149fed75ab616b5ac (patch)
treeca92efc4b44f87c56f35dbd17979af091e71cf5c
parent07a778e2efce987757e98086b2b733f3a4d8513f (diff)
downloadurpmi-64e3fcb670476ce5f5dea3f149fed75ab616b5ac.tar
urpmi-64e3fcb670476ce5f5dea3f149fed75ab616b5ac.tar.gz
urpmi-64e3fcb670476ce5f5dea3f149fed75ab616b5ac.tar.bz2
urpmi-64e3fcb670476ce5f5dea3f149fed75ab616b5ac.tar.xz
urpmi-64e3fcb670476ce5f5dea3f149fed75ab616b5ac.zip
move logging "retrieving done" just after sync_webfetch,
otherwise "found probed hdlist" is displayed before
-rw-r--r--urpm.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index b1272a77..2c7daca2 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1569,6 +1569,7 @@ sub _update_medium_first_pass__remote {
$options->{force} and unlink "$urpm->{cachedir}/partial/$basename";
if (sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/$with_hdlist") ],
$options, callback => $options->{callback}) && file_size("$urpm->{cachedir}/partial/$basename") > 32) {
+ $urpm->{log}(N("...retrieving done"));
$medium->{with_hdlist} = $with_hdlist;
$urpm->{log}(N("found probed hdlist (or synthesis) as %s", $medium->{with_hdlist}));
last; #- found a suitable with_hdlist in the list above.
@@ -1589,8 +1590,10 @@ sub _update_medium_first_pass__remote {
) or $urpm->{error}(N("...copying failed")), $error = 1;
}
}
- if (!sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/$medium->{with_hdlist}") ],
+ if (sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/$medium->{with_hdlist}") ],
$options, callback => $options->{callback})) {
+ $urpm->{log}(N("...retrieving done"));
+ } else {
$urpm->{error}(N("...retrieving failed: %s", $@));
unlink "$urpm->{cachedir}/partial/$basename";
}
@@ -1607,7 +1610,6 @@ sub _update_medium_first_pass__remote {
if (file_size("$urpm->{cachedir}/partial/$basename") > 32) {
$options->{callback} and $options->{callback}('done', $medium->{name});
- $urpm->{log}(N("...retrieving done"));
unless ($options->{force}) {
_read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium, $basename)