diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | pod/urpmi.addmedia.8.pod | 6 | ||||
| -rw-r--r-- | urpm/args.pm | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,7 @@ - urpmi: o handle README.urpmi in utf8 (but not other encodings) (#41553) +- urpmi.addmedia: + o make --mirrorlist with no url equivalent to --mirrorlist '$MIRRORLIST' (#40283) - urpmq: o --suggests now displays the suggested packages, see --allow-suggests for previous behaviour (#39726) diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod index 7edfcf39..448da92e 100644 --- a/pod/urpmi.addmedia.8.pod +++ b/pod/urpmi.addmedia.8.pod @@ -16,12 +16,12 @@ must be chosen: =over -=item B<urpmi.addmedia> [I<options>] --distrib --mirrorlist <I<url>> +=item B<urpmi.addmedia> [I<options>] --distrib --mirrorlist [<I<url>>] A mirror list is a special API to describe mirrors available. urpmi will pick the nearest mirror, and will dynamically handle new mirrors. Example: - urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' + urpmi.addmedia --distrib --mirrorlist =item B<urpmi.addmedia> [I<options>] --mirrorlist <I<url>> <I<name>> <I<relative path>> @@ -152,7 +152,7 @@ available. nb: $MIRRORLIST is a special variable which gives the default URL for the -current distribution/arch +current distribution/arch. $MIRRORLIST is the default mirrorlist. =item B<--distrib> diff --git a/urpm/args.pm b/urpm/args.pm index dc3db479..d2493fcb 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -333,7 +333,7 @@ my %options_spec = ( 'xml-info=s' => \$options{'xml-info'}, 'no-probe' => sub { $options{probe_with} = undef }, distrib => sub { $options{distrib} = 1 }, - 'mirrorlist=s' => \$options{mirrorlist}, + 'mirrorlist:s' => sub { $options{mirrorlist} = $_[1] || '$MIRRORLIST' }, interactive => sub { $options{interactive} = 1 }, 'all-media' => sub { $options{allmedia} = 1 }, 'from=s' => \$options{mirrors_url}, |