summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-13 10:42:36 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-13 10:42:36 +0000
commitfa1f3e2eea888ae47917d73740ce552f6beba24b (patch)
tree4cfd0abddeff7db84c49c5b4aa886ab5e6c78dba
parente1eda2f8ee6a40eeb19c48d5a00d3b717b2519ea (diff)
downloaddrakx-fa1f3e2eea888ae47917d73740ce552f6beba24b.tar
drakx-fa1f3e2eea888ae47917d73740ce552f6beba24b.tar.gz
drakx-fa1f3e2eea888ae47917d73740ce552f6beba24b.tar.bz2
drakx-fa1f3e2eea888ae47917d73740ce552f6beba24b.tar.xz
drakx-fa1f3e2eea888ae47917d73740ce552f6beba24b.zip
(media_screen) use media.cfg keywords in order to white list the media we want
needs urpmi-7.14
-rw-r--r--perl-install/install/any.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 65a31a54d..a3389580a 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -374,7 +374,11 @@ sub media_screen {
disabled => sub { $medium->{name} eq 'Core Release' },
format => sub { $descriptions{$_[0]} || translate(%descriptions) },
};
- } grep { $_->{name} !~ /Debug|Testing|Sources|Backports/ } @{$urpm->{media}},
+ } grep {
+ my ($distribconf, $medium_path) = @{$_->{mediacfg}};
+ my @media_types = split(':', $distribconf->getvalue($medium_path, 'media_type'));
+ !intersection(\@media_types, [ qw(backports debug source testing) ]);
+ } @{$urpm->{media}},
]);