summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-29 15:47:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-29 15:47:22 +0000
commit2527faf1b685fb32715f7ee02c66d96d754d8052 (patch)
treea56e2126e2beabe65cd19ebc03733ce343a81efe /urpm
parent026343726ab5c568b2581ccb03386e95c3d4fb43 (diff)
downloadurpmi-2527faf1b685fb32715f7ee02c66d96d754d8052.tar
urpmi-2527faf1b685fb32715f7ee02c66d96d754d8052.tar.gz
urpmi-2527faf1b685fb32715f7ee02c66d96d754d8052.tar.bz2
urpmi-2527faf1b685fb32715f7ee02c66d96d754d8052.tar.xz
urpmi-2527faf1b685fb32715f7ee02c66d96d754d8052.zip
do not download on the fly xml-info unless we know if it is available
(useful for the cdrom case where there is no MD5SUM, but we take care of xml-info during urpmi.addmedia, never afterwards)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 85ec6b04..959b44dd 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1646,9 +1646,8 @@ sub _any_media_info__or_download {
get_medium_option($urpm, $medium, 'xml-info') ne 'never' or return;
my $md5sum_file = statedir_MD5SUM($urpm, $medium);
- if (-e $md5sum_file) {
- urpm::md5sum::parse($md5sum_file)->{"$prefix$suffix"} or return;
- }
+ -e $md5sum_file &&
+ urpm::md5sum::parse($md5sum_file)->{"$prefix$suffix"} or return;
my $file_in_partial =
_download_media_info_file($urpm, $medium, $prefix, $suffix, $quiet, $download_dir, $o_callback) or return;