From c82cfab97f95aebcde08ccde1736c4229fd8404c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 27 Feb 2008 17:53:10 +0000 Subject: - adapt "we want to copy lzma from cds" to new cdrom:// scheme - missing lzma on cds is not a failure --- urpm/media.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urpm/media.pm') diff --git a/urpm/media.pm b/urpm/media.pm index f421ad7a..6e4f61b0 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1577,10 +1577,11 @@ sub _retrieve_xml_media_info_or_remove { foreach my $xml_info (@xml_media_info) { my $f = statedir_xml_info($urpm, $medium, $xml_info); - if ($medium->{removable} || + if (urpm::is_cdrom_url($medium->{url}) || get_medium_option($urpm, $medium, 'xml-info') eq 'always' || get_medium_option($urpm, $medium, 'xml-info') eq 'update-only' && -e $f) { $ok &&= _retrieve_media_info_file_and_check_MD5SUM($urpm, $medium, $xml_info, '.xml.lzma', $quiet); + $ok = 1 if urpm::is_cdrom_url($medium->{url}); } else { #- "on-demand" unlink $f; -- cgit v1.2.1