diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-27 17:53:10 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-27 17:53:10 +0000 |
| commit | c82cfab97f95aebcde08ccde1736c4229fd8404c (patch) | |
| tree | 3dab84885991954923a93a7b1301bbcac283f86d | |
| parent | 6ad8276603af8eaba9f53a821bda3ae19cfdd76f (diff) | |
| download | urpmi-c82cfab97f95aebcde08ccde1736c4229fd8404c.tar urpmi-c82cfab97f95aebcde08ccde1736c4229fd8404c.tar.gz urpmi-c82cfab97f95aebcde08ccde1736c4229fd8404c.tar.bz2 urpmi-c82cfab97f95aebcde08ccde1736c4229fd8404c.tar.xz urpmi-c82cfab97f95aebcde08ccde1736c4229fd8404c.zip | |
- adapt "we want to copy lzma from cds" to new cdrom:// scheme
- missing lzma on cds is not a failure
| -rw-r--r-- | urpm/media.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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; |