summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-17 13:35:08 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-17 13:35:08 +0000
commit163a5633c9be06d32436af8f20690ebbc1b39a75 (patch)
treebe94dd3ad8c4d9cfcb14e8e8efbc380f9e645c6f
parentb67ef914228c998b72f7317734d438b45d23f333 (diff)
downloadurpmi-163a5633c9be06d32436af8f20690ebbc1b39a75.tar
urpmi-163a5633c9be06d32436af8f20690ebbc1b39a75.tar.gz
urpmi-163a5633c9be06d32436af8f20690ebbc1b39a75.tar.bz2
urpmi-163a5633c9be06d32436af8f20690ebbc1b39a75.tar.xz
urpmi-163a5633c9be06d32436af8f20690ebbc1b39a75.zip
really auto enable tainted media if needed when adding distrib media
-rw-r--r--NEWS3
-rw-r--r--urpm/media.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9129262c..4484625b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- library:
+ o really auto enable tainted media if needed when adding distrib media
+
Version 7.27 - 17 May 2013, by Thierry Vignaud
- gurpmi2:
diff --git a/urpm/media.pm b/urpm/media.pm
index 2ef9d911..d917cb45 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -793,7 +793,7 @@ sub is_media_to_add_by_default {
$add_by_default = 1;
$urpm->{log}(N("un-ignoring non-free medium `%s' b/c nonfree packages are installed", $medium_name));
}
- if ($medium_name =~ /Nonfree/ && $tainted) {
+ if ($medium_name =~ /Tainted/ && $tainted) {
$add_by_default = 1;
$urpm->{log}(N("un-ignoring tainted medium `%s' b/c tainted packages are installed", $medium_name));
}