summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-11-24 10:39:19 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-11-24 10:39:19 +0000
commit77b8ccd9dcc10ea9ca2b0d76009308872e964ba0 (patch)
tree31f19b4682527ded5fc35d3499ebdc14bee6a76f
parente4daecb730c13bf6df7b61f9e6ef700935cbc7ae (diff)
downloadurpmi-77b8ccd9dcc10ea9ca2b0d76009308872e964ba0.tar
urpmi-77b8ccd9dcc10ea9ca2b0d76009308872e964ba0.tar.gz
urpmi-77b8ccd9dcc10ea9ca2b0d76009308872e964ba0.tar.bz2
urpmi-77b8ccd9dcc10ea9ca2b0d76009308872e964ba0.tar.xz
urpmi-77b8ccd9dcc10ea9ca2b0d76009308872e964ba0.zip
Work around a bug in curl when displaying progress for an authentified
http source (bug #12289)
-rw-r--r--urpm/download.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/urpm/download.pm b/urpm/download.pm
index 8bcb298f..7078fb11 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -336,7 +336,9 @@ sub sync_curl {
close $curl;
return;
}
- if ($_ eq "\n") {
+ #- this regexp checks that download has actually started
+ #- (work around a bug in curl 7.12.2 output for auth sources)
+ if ($_ eq "\n" && $buf !~ /--:--:-- --:--:-- --:--:--/) {
propagate_sync_callback($options, 'end', $file);
$file = undef;
}