diff options
author | Olivier Blin <oblin@mandriva.org> | 2004-06-18 05:39:25 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2004-06-18 05:39:25 +0000 |
commit | fe087ed9bb223366676eef790def68102497f77c (patch) | |
tree | 7da5b182e8c897fc8747922700ddaaec6f28eea1 /perl-install/pkgs.pm | |
parent | 7b6bbc8cea37946eea1aca650b7d47b2263bd362 (diff) | |
download | drakx-fe087ed9bb223366676eef790def68102497f77c.tar drakx-fe087ed9bb223366676eef790def68102497f77c.tar.gz drakx-fe087ed9bb223366676eef790def68102497f77c.tar.bz2 drakx-fe087ed9bb223366676eef790def68102497f77c.tar.xz drakx-fe087ed9bb223366676eef790def68102497f77c.zip |
add and use install_any::method_allows_medium_change
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r-- | perl-install/pkgs.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index ed1f7eaa2..618ef63b9 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -448,7 +448,7 @@ sub psUsingHdlist { #- avoid using more than one medium if Cd is not ejectable. #- but keep all medium here so that urpmi has the whole set. - $m->{ignored} ||= $method =~ /(^cdrom|-iso)$/ && $medium > 1 && !common::usingRamdisk(); + $m->{ignored} ||= install_any::method_allows_medium_change($method) && $medium > 1 && !common::usingRamdisk(); #- parse synthesis (if available) of directly hdlist (with packing). if ($m->{ignored}) { @@ -922,7 +922,7 @@ sub installTransactionClosure { #- it is sure at least one package will be installed according to medium chosen. install_any::useMedium($medium->{medium}); - if ($medium->{method} =~ /(^cdrom|-iso)$/) { + if (install_any::method_allows_medium_change($medium->{method})) { my $pkg = $packages->{depslist}[$l[0]]; #- force changeCD callback to be called from main process. |