summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--urpm/media.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b52c77ef..6b0c5e93 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o handle README.urpmi in utf8 (but not other encodings) (#41553)
- urpmi.addmedia:
o make --mirrorlist with no url equivalent to --mirrorlist '$MIRRORLIST' (#40283)
+ o --interactive: fix selecting "noauto" media (#39522)
- urpmq:
o --suggests now displays the suggested packages, see --allow-suggests for
previous behaviour (#39726)
diff --git a/urpm/media.pm b/urpm/media.pm
index 677feab1..d1dc8644 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -852,12 +852,14 @@ sub add_distrib_media {
}
my $add_by_default = !$distribconf->getvalue($media, 'noauto');
+ my $ignore;
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');
$add_by_default || $simple_rpms or next;
+ $ignore = !$add_by_default;
}
my $use_copied_synthesis = urpm::is_cdrom_url($url) || $urpm->{options}{use_copied_hdlist} || $distribconf->getvalue($media, 'use_copied_hdlist');
@@ -873,7 +875,7 @@ sub add_distrib_media {
!$use_copied_synthesis ? (media_info_dir => 'media_info') : (),
!$use_copied_synthesis && $options{probe_with} ? ($options{probe_with} => 1) : (),
index_name => $name ? undef : 0,
- $add_by_default ? () : (ignore => 1),
+ $ignore ? (ignore => 1) : (),
%options,
# the following override %options
$options{mirrorlist} ? ('with-dir' => $distribconf->getpath($media, 'path')) : (),