diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-11-19 11:12:55 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-11-19 11:12:55 +0000 |
| commit | 954c4f6e095f26d1e195dc6295c60c1eaeaa3e39 (patch) | |
| tree | 32021267d7427f20bb55090ea8a93af3ac424616 /urpm | |
| parent | 7654ecb6a291395e51e5379b41f59eb01a2f2b6d (diff) | |
| download | urpmi-954c4f6e095f26d1e195dc6295c60c1eaeaa3e39.tar urpmi-954c4f6e095f26d1e195dc6295c60c1eaeaa3e39.tar.gz urpmi-954c4f6e095f26d1e195dc6295c60c1eaeaa3e39.tar.bz2 urpmi-954c4f6e095f26d1e195dc6295c60c1eaeaa3e39.tar.xz urpmi-954c4f6e095f26d1e195dc6295c60c1eaeaa3e39.zip | |
Cope better with some strange curl output
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/download.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index a9a309ed..8bcb298f 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -330,7 +330,7 @@ sub sync_curl { $file = shift @l; propagate_sync_callback($options, 'start', $file); } - if (my ($percent, $total, $eta, $speed) = $buf =~ /^\s*(\d+)\s+(\S+)[^\r\n]*\s+(\S+)\s+(\S+)[\r\n]$/ms) { + if (my ($percent, $total, $eta, $speed) = $buf =~ /^\s*(\d+)\s+(\S+)[^\r\n]*\s+(\S+)\s+-?(\S+)\s*[\r\n]$/ms) { if (propagate_sync_callback($options, 'progress', $file, $percent, $total, $eta, $speed) eq 'canceled') { kill 15, $curl_pid; close $curl; |