From b7627f8cad5cfbb478ab9a990a0544c93cc4cce6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 28 Feb 2008 14:45:21 +0000 Subject: - urpmf, urpmq: o do not try to download xml-info if it's not available (#38125) --- NEWS | 2 ++ urpm/media.pm | 5 +++++ 2 files changed, 7 insertions(+) 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; -- cgit v1.2.1