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/pkgs.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 836e1ba7b..91c2692aa 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -236,7 +236,7 @@ sub allMediums { sort { #- put supplementary media at the end my @x = ($a, $b); - foreach (@x) { /(\d+)s/ and $_ = 100 + $1 } + foreach (@x) { install_medium::by_id($_, $packages)->is_suppl and $_ += 100 } $x[0] <=> $x[1]; } keys %{$packages->{mediums}}; } @@ -1484,10 +1484,7 @@ sub by_id { } #- is this medium a supplementary medium ? -sub is_suppl { - my ($self) = @_; - $self->{issuppl} || $self->{medium} =~ /^\d+s$/; #- XXX remove medium name kludge -} +sub is_suppl { my ($self) = @_; $self->{issuppl} } sub mark_suppl { my ($self) = @_; $self->{issuppl} = 1 } -- cgit v1.2.1