summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-18 05:39:25 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-18 05:39:25 +0000
commitfe087ed9bb223366676eef790def68102497f77c (patch)
tree7da5b182e8c897fc8747922700ddaaec6f28eea1 /perl-install/install_any.pm
parent7b6bbc8cea37946eea1aca650b7d47b2263bd362 (diff)
downloaddrakx-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/install_any.pm')
-rw-r--r--perl-install/install_any.pm6
1 files changed, 5 insertions, 1 deletions
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} = [];