diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-27 01:57:05 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-05-27 01:57:05 +0000 |
| commit | e6afe9e361836f42de66f2e1f6f4622f5f99a426 (patch) | |
| tree | 31893b5e37cfa3ee46349209081283a639e688f1 /perl-install/install_any.pm | |
| parent | f9138508ab719c6cd033431ccae5d85364f5f2df (diff) | |
| download | drakx-backup-do-not-use-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar drakx-backup-do-not-use-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.gz drakx-backup-do-not-use-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.bz2 drakx-backup-do-not-use-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.xz drakx-backup-do-not-use-e6afe9e361836f42de66f2e1f6f4622f5f99a426.zip | |
Remove the naming convention with a trailing "s" for supplementary CDs medium ids
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index eec4873b1..4a46564a6 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -184,7 +184,6 @@ sub errorOpeningFile($) { } #- Do not unselect supplementary CDs. - #return if $asked_medium =~ /^\d+s$/; return if install_medium::by_id($asked_medium)->is_suppl_cd; #- keep in mind the asked medium has been refused on this way. @@ -451,9 +450,7 @@ sub selectSupplMedia { 'Network (http)' => 'http', 'Network (ftp)' => 'ftp', }->{$suppl}; - my $medium_name = $suppl_method eq 'cdrom' - ? (max(map { $_->{medium} =~ /^(\d+)s$/ ? $1 : 0 } values %{$o->{packages}{mediums}}) + 1) . "s" - : int(keys %{$o->{packages}{mediums}}) + 1; + my $medium_name = int(keys %{$o->{packages}{mediums}}) + 1; #- configure network if needed prep_net_suppl_media($o) if !scalar keys %{$o->{intf}} && $suppl_method !~ /^(?:cdrom|disk)/; local $::isWizard = 0; |