summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-10 14:06:55 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-10 14:06:55 +0000
commit1fae25c2a0b343d3488648ef45b793c3d649cbc2 (patch)
tree7078620dff48acac0b798193015da611d131131a /perl-install/install
parentfbdbb045ea8ad444ef900d85e6dc3ae8221b1606 (diff)
downloaddrakx-1fae25c2a0b343d3488648ef45b793c3d649cbc2.tar
drakx-1fae25c2a0b343d3488648ef45b793c3d649cbc2.tar.gz
drakx-1fae25c2a0b343d3488648ef45b793c3d649cbc2.tar.bz2
drakx-1fae25c2a0b343d3488648ef45b793c3d649cbc2.tar.xz
drakx-1fae25c2a0b343d3488648ef45b793c3d649cbc2.zip
(media_screen blacklist unwanted media instead of whitelisting wanted ones
thus fixing dual cd where media names are not the regular ones
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS4
-rw-r--r--perl-install/install/any.pm3
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bf94d6063..e5170b237 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- media choice step:
+ o blacklist unwanted media instead of whitelisting wanted ones
+ (fix dual cd where media names are not the regular ones)
+
Version 15.6 - 10 December 2012
- language choise:
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 58afe29a0..26bbe9f0b 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -343,6 +343,7 @@ sub media_screen {
# rpm -qa |grep tainted/non-free + check for kmod with firmwares
# - use red color in that case (gtk+ version? interactive::gtk version?)
# - present media as trees (eg 3 main branches (core/nonfree/tainted and sub medium below (release/updates/...)
+ # - use keywords (backports,testing,testing,sources) to blacklist
my %descriptions = (
'Core Release' => N("\"%s\" contains the various pieces of the systems and its applications", _core_medium()),
'Nonfree Release' => N("\"%s\" contains non free software.\n", _nonfree_medium()) .
@@ -366,7 +367,7 @@ sub media_screen {
disabled => sub { $medium->{name} eq 'Core Release' },
format => sub { $descriptions{$_[0]} || translate(%descriptions) },
};
- } grep { $_->{name} =~ /Release$|Updates$/ } @{$urpm->{media}},
+ } grep { $_->{name} !~ /Debug|Testing|Sources|Backports/ } @{$urpm->{media}},
]);