From 7f6aded9b5cdc42487e2b2276fb657825f8e4d10 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 30 May 2013 06:29:05 +0000
Subject: 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)")
---
 NEWS          | 5 +++++
 urpm/media.pm | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9b837698..1eaa932b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- library:
+  o ensure priority updates are installed in a single transaction
+  o revert fix for mga#10254 in previous release
+    (the bug was in media.cfg, mga#10335)
+
 Version 7.27.2 - 24 May 2013, by Thierry Vignaud
 
 - library:
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)) {
-- 
cgit v1.2.1