From e6afe9e361836f42de66f2e1f6f4622f5f99a426 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Fri, 27 May 2005 01:57:05 +0000 Subject: Remove the naming convention with a trailing "s" for supplementary CDs medium ids --- perl-install/install_any.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'perl-install/install_any.pm') 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; -- cgit v1.2.1