summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-27 01:57:05 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-27 01:57:05 +0000
commite6afe9e361836f42de66f2e1f6f4622f5f99a426 (patch)
tree31893b5e37cfa3ee46349209081283a639e688f1 /perl-install/pkgs.pm
parentf9138508ab719c6cd033431ccae5d85364f5f2df (diff)
downloaddrakx-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar
drakx-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.gz
drakx-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.bz2
drakx-e6afe9e361836f42de66f2e1f6f4622f5f99a426.tar.xz
drakx-e6afe9e361836f42de66f2e1f6f4622f5f99a426.zip
Remove the naming convention with a trailing "s" for supplementary CDs medium ids
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm7
1 files changed, 2 insertions, 5 deletions
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 }