summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-19 16:05:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-19 16:05:04 +0000
commit9f8fa0af0e21e87e635eaf4255ebeacb24f477c2 (patch)
tree0bac49b4dd6427bcf3d3547774bdcbf1b436cf9a
parentf9d3968671b2d1ab894a8a9e66b3d4bbd0f31cd6 (diff)
downloadurpmi-9f8fa0af0e21e87e635eaf4255ebeacb24f477c2.tar
urpmi-9f8fa0af0e21e87e635eaf4255ebeacb24f477c2.tar.gz
urpmi-9f8fa0af0e21e87e635eaf4255ebeacb24f477c2.tar.bz2
urpmi-9f8fa0af0e21e87e635eaf4255ebeacb24f477c2.tar.xz
urpmi-9f8fa0af0e21e87e635eaf4255ebeacb24f477c2.zip
- urpmi.addmedia:
o --distrib: do not skip "debug_for=" media (debug media will be added with flag "ignore" if noauto=1) as requested by fcrozat and tvignaud
-rw-r--r--NEWS4
-rw-r--r--urpm/media.pm3
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b84f2308..333b51c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- urpmi.addmedia:
+ o --distrib: do not skip "debug_for=" media
+ (debug media will be added with flag "ignore" if noauto=1)
+
Version 6.13 - 18 September 2008
- aria2:
diff --git a/urpm/media.pm b/urpm/media.pm
index fae5abb2..cec08f52 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -868,8 +868,7 @@ sub add_distrib_media {
if ($options{ask_media}) {
$options{ask_media}->($media_name, $add_by_default) or next;
} else {
- my $simple_rpms = !$distribconf->getvalue($media, 'debug_for') &&
- !$distribconf->getvalue($media, 'rpms');
+ my $simple_rpms = !$distribconf->getvalue($media, 'rpms');
$add_by_default || $simple_rpms or next;
$ignore = !$add_by_default;
}