summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-03 13:14:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-03 13:14:39 +0000
commita9a461c295a866f3b3dfe7daca710f36f8a2aff2 (patch)
tree4929b4d04a261fa92b521167e6d7ac6e30a43017
parent2da9497b3f0bcf989fb8767a6662737b6a9ef637 (diff)
downloadurpmi-a9a461c295a866f3b3dfe7daca710f36f8a2aff2.tar
urpmi-a9a461c295a866f3b3dfe7daca710f36f8a2aff2.tar.gz
urpmi-a9a461c295a866f3b3dfe7daca710f36f8a2aff2.tar.bz2
urpmi-a9a461c295a866f3b3dfe7daca710f36f8a2aff2.tar.xz
urpmi-a9a461c295a866f3b3dfe7daca710f36f8a2aff2.zip
- urpmf, urpmq:
o never display raw downloader output, otherwise output is very messy (#38125)
-rw-r--r--NEWS1
-rw-r--r--urpm/media.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 982eaaa5..6ade1335 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
you can now use more than one cdrom drive
o fix download progression using wget
- urpmf, urpmq:
+ o never display raw downloader output, otherwise output is very messy (#38125)
o do not try to download xml-info if it's not available (#38125)
- urpmi.addmedia:
o fix --distrib for cdroms (#30613)
diff --git a/urpm/media.pm b/urpm/media.pm
index 2862351e..878662ee 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -359,11 +359,11 @@ sub any_media_info_file {
}
sub any_hdlist {
my ($urpm, $medium, $quiet) = @_;
- any_media_info_file($urpm, $medium, 'hdlist', '.cz', $quiet);
+ any_media_info_file($urpm, $medium, 'hdlist', '.cz', $quiet, \&urpm::download::sync_logger);
}
sub any_xml_info {
my ($urpm, $medium, $xml_info, $quiet, $o_callback) = @_;
- any_media_info_file($urpm, $medium, $xml_info, '.xml.lzma', $quiet, $o_callback);
+ any_media_info_file($urpm, $medium, $xml_info, '.xml.lzma', $quiet, $o_callback || \&urpm::download::sync_logger);
}
sub name2medium {