diff options
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | pod/8/urpmi.addmedia.pod | 12 | ||||
| -rw-r--r-- | pod/8/urpmi.pod | 2 | ||||
| -rw-r--r-- | pod/8/urpmi.update.pod | 6 | ||||
| -rw-r--r-- | pod/8/urpmq.pod | 8 | ||||
| -rw-r--r-- | urpm/download.pm | 2 |
6 files changed, 17 insertions, 15 deletions
@@ -1,3 +1,5 @@ +- library: + o prefer wget to curl as the default downloader (mga#24362) - cpan_testers: o Skip mirrorlist tests if there's only one broken mirror such as on mga[1-6] - urpmq: diff --git a/pod/8/urpmi.addmedia.pod b/pod/8/urpmi.addmedia.pod index ec51670e..03e96ad9 100644 --- a/pod/8/urpmi.addmedia.pod +++ b/pod/8/urpmi.addmedia.pod @@ -35,8 +35,8 @@ where <I<name>> is a human-readable name for the new media (e.g. "updates"). <I<name>> is optional if B<--distrib> is given in the options list. <I<host>>/<I<path>> is the location of the media directory on the net (e.g. C<media/main>). The location is given relative to -<I<path>>. B<curl> is used by default to download files, B<wget> may be -used if B<curl> is not installed or if or B<--wget> is given in +<I<path>>. B<wget> is used by default to download files, B<curl> may be +used if B<wget> is not installed or if or B<--curl> is given in I<options>. Example: urpmi.addmedia http http://jpackage.sf.net/rpm/free @@ -191,13 +191,13 @@ Don't import pubkey of added media. =item B<--wget> -Use wget only for downloading distant files. By default curl is used if -available. +Use wget only for downloading distant files. This is the default if wget +is available. =item B<--curl> -Use curl only for downloading distant files. This is the default if curl -is available. +Use curl only for downloading distant files. By default wget is used if +available. =item B<--curl-options> I<'options'> diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod index 41eb3713..43a874c5 100644 --- a/pod/8/urpmi.pod +++ b/pod/8/urpmi.pod @@ -406,7 +406,7 @@ manpage. =item B<--downloader> I<program name> Use a specific program for downloading distant files via http or ftp. -By default curl is used if available, or wget instead. +By default wget is used if available, or curl instead. =item B<--curl-options> I<'options'> diff --git a/pod/8/urpmi.update.pod b/pod/8/urpmi.update.pod index 765f78c8..efd80472 100644 --- a/pod/8/urpmi.update.pod +++ b/pod/8/urpmi.update.pod @@ -75,12 +75,12 @@ Verbose mode. =item B<--curl> Use curl for downloading distant -files. By default curl is used if available, or wget instead. +files. By default wget is used if available, or curl instead. =item B<--wget> -Use wget for downloading distant files. By default curl -is used if available, or wget instead. +Use wget for downloading distant files. By default wget +is used if available, or curl instead. =item B<--curl-options> I<'options'> diff --git a/pod/8/urpmq.pod b/pod/8/urpmq.pod index c0ef1fb7..883bfca3 100644 --- a/pod/8/urpmq.pod +++ b/pod/8/urpmq.pod @@ -310,13 +310,13 @@ F</etc/urpmi/prefer.list> (see urpmi.files(5)). =item B<--wget> -Use wget for downloading distant files. By default curl -is used if available, or wget instead. +Use wget for downloading distant files. By default wget +is used if available, or curl instead. =item B<--curl> -Use curl for downloading distant files. By default curl is used if -available, or wget instead. +Use curl for downloading distant files. By default wget is used if +available, or curl instead. =item B<--curl-options> I<'options'> diff --git a/urpm/download.pm b/urpm/download.pm index 790ccf91..2d10f9ce 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -40,7 +40,7 @@ urpm::download - download routines for the urpm* tools =cut -sub ftp_http_downloaders() { qw(curl wget prozilla aria2) } +sub ftp_http_downloaders() { qw(wget curl prozilla aria2) } sub available_ftp_http_downloaders() { my %binaries = ( |