diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2004-02-06 17:40:17 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2004-02-06 17:40:17 +0000 |
commit | 0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a (patch) | |
tree | cc17f675904a2a5c9402d2f9b26009ca14fbfdc3 | |
parent | 7e2d7a182f9b8d21b7a49591e0a9f5533cc2d4ad (diff) | |
download | urpmi-0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a.tar urpmi-0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a.tar.gz urpmi-0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a.tar.bz2 urpmi-0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a.tar.xz urpmi-0f4f39875380f69bcd1ecab9ba68b3c0d56cc05a.zip |
fix english prefered->preferred
-rw-r--r-- | urpm.pm | 10 | ||||
-rw-r--r-- | urpmi.spec | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -136,16 +136,16 @@ sub sync_webfetch { if ($files{ftp} || $files{http} || $files{https}) { my @webfetch = qw(curl wget); my @available_webfetch = grep { -x "/usr/bin/$_" } @webfetch; - my $prefered; + my $preferred; #- use user default downloader if provided and available if ($urpm->{options}{downloader}) { - $prefered = find { $_ eq $urpm->{options}{downloader} } @available_webfetch; + $preferred = find { $_ eq $urpm->{options}{downloader} } @available_webfetch; } #- else first downloader of @webfetch is the default one - $prefered ||= $available_webfetch[0]; - if ($prefered eq 'curl') { + $preferred ||= $available_webfetch[0]; + if ($preferred eq 'curl') { sync_curl($options, @{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []}); - } elsif ($prefered eq 'wget') { + } elsif ($preferred eq 'wget') { sync_wget($options, @{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []}); } else { die N("no webfetch found, supported webfetch are: %s\n", join(", ", @webfetch)); @@ -1119,7 +1119,7 @@ $urpm->update_media(nolock => 1, nopubkey => 1); * Fri Jun 28 2002 François Pons <fpons@mandrakesoft.com> 3.6-4mdk - increase retry count to 10 instead of 3 for rsync and ssh protocol. -- support prefered tools to download files (grpmi only handles ftp +- support preferred tools to download files (grpmi only handles ftp and http protocol currently). - change behaviour of no answered to remove package to simply ignore remove instead of exiting. |