diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 12:51:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 12:51:56 +0000 |
| commit | a7daafde9b77d5c50deeb53cc67fd8475a922465 (patch) | |
| tree | e9d5938fe67eccb182c62bea2d737d0ffb6006fe | |
| parent | acf6abe23956c574fd1fadf56191ede150ec0fc0 (diff) | |
| download | urpmi-a7daafde9b77d5c50deeb53cc67fd8475a922465.tar urpmi-a7daafde9b77d5c50deeb53cc67fd8475a922465.tar.gz urpmi-a7daafde9b77d5c50deeb53cc67fd8475a922465.tar.bz2 urpmi-a7daafde9b77d5c50deeb53cc67fd8475a922465.tar.xz urpmi-a7daafde9b77d5c50deeb53cc67fd8475a922465.zip | |
- urpmi.addmedia
o --interactive: fix selecting "noauto" media (#39522)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm/media.pm | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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')) : (), |