From fe087ed9bb223366676eef790def68102497f77c Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 18 Jun 2004 05:39:25 +0000 Subject: add and use install_any::method_allows_medium_change --- perl-install/install_any.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'perl-install/install_any.pm') diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e37a26df9..300913446 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -42,7 +42,7 @@ my %iso_images; sub useMedium($) { #- before ejecting the first CD, there are some files to copy! #- does nothing if the function has already been called. - $_[0] > 1 and $::o->{method} =~ /(^cdrom|-iso)$/ and setup_postinstall_rpms($::prefix, $::o->{packages}); + $_[0] > 1 and method_allows_medium_change($::o->{method}) and setup_postinstall_rpms($::prefix, $::o->{packages}); $asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'"); $asked_medium = $_[0]; @@ -69,6 +69,10 @@ sub askChangeMedium($$) { log::l($allow ? "accepting medium $medium" : "refusing medium $medium"); $allow; } +sub method_allows_medium_change($) { + my ($method) = @_; + $method eq "cdrom" || $method eq "disk-iso"; +} sub look_for_ISOs() { $iso_images{media} = []; -- cgit v1.2.1