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/install_steps_interactive.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/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 7d948ca1d..a09321277 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -384,7 +384,7 @@ sub choosePackages { #- this is done at the very beginning to take into account #- selection of CD by user if using a cdrom. - $o->chooseCD($packages) if $o->{method} =~ /(^cdrom|-iso)$/ && !$::oem; + $o->chooseCD($packages) if install_any::method_allows_medium_change($o->{method}) && !$::oem; my $w = $o->wait_message('', N("Looking for available packages...")); my $availableC = &install_steps::choosePackages; @@ -684,7 +684,7 @@ sub installPackages { my ($method, $medium) = @_; #- if not using a cdrom medium or an iso image, always abort. - return unless $method =~ /(^cdrom|-iso)$/ && !$::oem; + return unless method_allows_medium_change($method) && !$::oem; my $name = pkgs::mediumDescr($o->{packages}, $medium); local $| = 1; print "\a"; |