summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-16 09:16:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-16 09:16:33 +0000
commitf87a8a536cab16bdca864250c9e3302b01677ba4 (patch)
tree9f740e99f0e2db03d1dbb3cd592339e1ec13b345
parentfed9ca0197135dda347e2da9e34c56afaa0478db (diff)
downloadurpmi-f87a8a536cab16bdca864250c9e3302b01677ba4.tar
urpmi-f87a8a536cab16bdca864250c9e3302b01677ba4.tar.gz
urpmi-f87a8a536cab16bdca864250c9e3302b01677ba4.tar.bz2
urpmi-f87a8a536cab16bdca864250c9e3302b01677ba4.tar.xz
urpmi-f87a8a536cab16bdca864250c9e3302b01677ba4.zip
extract error from aria2 log instead of giving it raw
(backported from trunk)
-rw-r--r--urpm/download.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm/download.pm b/urpm/download.pm
index 14c0b753..9abe039d 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -703,8 +703,8 @@ sub sync_aria2 {
if ($buf =~ m!Download\scomplete:\s\./!) {
propagate_sync_callback($options, 'end', $file);
$file = undef;
- } elsif ($buf =~ /ERR\|/) {
- propagate_sync_callback($options, 'error', $file, $buf);
+ } elsif ($buf =~ /ERR\|(.*)/) {
+ propagate_sync_callback($options, 'error', $file, $1);
}
} else {
$options->{quiet} or print STDERR "$buf\n";