From 622997696fb4a7bcedee2b81ddcf07598c3d2e52 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 18 Jun 2004 05:20:25 +0000 Subject: in disk-iso install, automatically choose and change ISO images, according to their volume id and application id --- perl-install/pkgs.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 3934fa0fe..ed1f7eaa2 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 eq 'cdrom' && $medium > 1 && !common::usingRamdisk(); + $m->{ignored} ||= $method =~ /(^cdrom|-iso)$/ && $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} eq 'cdrom') { + if ($medium->{method} =~ /(^cdrom|-iso)$/) { my $pkg = $packages->{depslist}[$l[0]]; #- force changeCD callback to be called from main process. -- cgit v1.2.1