summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-30 06:29:05 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-30 06:29:05 +0000
commit7f6aded9b5cdc42487e2b2276fb657825f8e4d10 (patch)
tree2b49880a06d338d7ce976ae37726b77d1d924028 /urpm/media.pm
parent184962ab3564b6ea668dd8c8a965eb1f9554110f (diff)
downloadurpmi-7f6aded9b5cdc42487e2b2276fb657825f8e4d10.tar
urpmi-7f6aded9b5cdc42487e2b2276fb657825f8e4d10.tar.gz
urpmi-7f6aded9b5cdc42487e2b2276fb657825f8e4d10.tar.bz2
urpmi-7f6aded9b5cdc42487e2b2276fb657825f8e4d10.tar.xz
urpmi-7f6aded9b5cdc42487e2b2276fb657825f8e4d10.zip
revert fix for mga#10254 in previous release (mga#10335)
the bug was actually in media.cfg basically reverting commit r8361 on 2013-05-24 (was: "fix wrongly enabling backports/testing for tainted/nonfree (mga#10254)")
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index d85567d8..681701e4 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -779,7 +779,7 @@ sub needed_extra_media {
sub is_media_to_add_by_default {
my ($urpm, $distribconf, $medium, $product_id, $nonfree, $tainted) = @_;
my $add_by_default = !$distribconf->getvalue($medium, 'noauto');
- my @media_types = split(':', $distribconf->getvalue($medium, 'media_types'));
+ my @media_types = split(':', $distribconf->getvalue($medium, 'media_type'));
return $add_by_default if !@media_types;
if ($product_id->{product} eq 'Free') {
if (member('non-free', @media_types)) {