summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-28 14:45:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-28 14:45:21 +0000
commitb7627f8cad5cfbb478ab9a990a0544c93cc4cce6 (patch)
tree0bce0c59f274571e54aa17ca6b3538c50c131448
parent59a01a6fabd2ab19a5b5da320acdf02f0015b978 (diff)
downloadurpmi-b7627f8cad5cfbb478ab9a990a0544c93cc4cce6.tar
urpmi-b7627f8cad5cfbb478ab9a990a0544c93cc4cce6.tar.gz
urpmi-b7627f8cad5cfbb478ab9a990a0544c93cc4cce6.tar.bz2
urpmi-b7627f8cad5cfbb478ab9a990a0544c93cc4cce6.tar.xz
urpmi-b7627f8cad5cfbb478ab9a990a0544c93cc4cce6.zip
- urpmf, urpmq:
o do not try to download xml-info if it's not available (#38125)
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm5
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index b474cf07..e67d9c8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- all tools:
o cdrom:// replaces removable://
+- urpmf, urpmq:
+ o do not try to download xml-info if it's not available (#38125)
- urpmi.addmedia:
o fix --distrib for cdroms (#30613)
- urpmi:
diff --git a/urpm/media.pm b/urpm/media.pm
index ff45f922..4c20f0be 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1642,6 +1642,11 @@ 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;
+ }
my $file_in_partial =
_download_media_info_file($urpm, $medium, $prefix, $suffix, $quiet, $download_dir, $o_callback) or return;