summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-08 14:57:42 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-08 14:57:42 +0000
commite2f19cc7120b37c06ea2198edd9b19ebbb02cdcb (patch)
treede0b9a9a985ef26e0edcd613f3353b6652a6b6f2
parent1dcbd983b554e2a21f9ec062f17580a8901943a5 (diff)
downloaddrakx-e2f19cc7120b37c06ea2198edd9b19ebbb02cdcb.tar
drakx-e2f19cc7120b37c06ea2198edd9b19ebbb02cdcb.tar.gz
drakx-e2f19cc7120b37c06ea2198edd9b19ebbb02cdcb.tar.bz2
drakx-e2f19cc7120b37c06ea2198edd9b19ebbb02cdcb.tar.xz
drakx-e2f19cc7120b37c06ea2198edd9b19ebbb02cdcb.zip
When sorting CDs, put supplementary CDs at the end
-rw-r--r--perl-install/pkgs.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index c18755d81..f3b1c34cc 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -240,8 +240,14 @@ sub packagesToInstall {
sub allMediums {
my ($packages) = @_;
- sort { $a <=> $b } keys %{$packages->{mediums}};
+ sort {
+ #- put supplementary media at the end
+ my @x = ($a, $b);
+ foreach (@x) { /(\d+)s/ and $_ = 100 + $1 }
+ $x[0] <=> $x[1];
+ } keys %{$packages->{mediums}};
}
+
sub mediumDescr {
my ($packages, $medium_name) = @_;
$packages->{mediums}{$medium_name}{descr};