From 4da170df8c4a910ba7ec60336e86870b16ae1e26 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 24 May 2013 20:56:23 +0000 Subject: fix wrongly enabling backports/testing for tainted/nonfree (mga#10254) (when such packages are already installed) --- NEWS | 2 ++ urpm/media.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7405fae0..ffc027f5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ - library: o ensure priority updates are installed in a single transaction + o fix wrongly enabling backports/testing for tainted/nonfree when + such packages are already installed (mga#10254) Version 7.27.1 - 17 May 2013, by Thierry Vignaud diff --git a/urpm/media.pm b/urpm/media.pm index d917cb45..e3eafdbf 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_type')); + my @media_types = split(':', $distribconf->getvalue($medium, 'media_types')); if ($product_id->{product} eq 'Free') { if (member('non-free', @media_types)) { $urpm->{log}(N("ignoring non-free medium `%s'", $medium)); -- cgit v1.2.1