diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-01-28 01:01:30 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-01-28 01:01:30 +0000 |
| commit | d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c (patch) | |
| tree | 860cd1e55843e6b806015490089b40221c6f14b0 | |
| parent | 882e3130561276b6f40c6d5ddb842de6049bbe85 (diff) | |
| download | urpmi-d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c.tar urpmi-d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c.tar.gz urpmi-d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c.tar.bz2 urpmi-d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c.tar.xz urpmi-d5e95fa23cf1d36d6e9709e5a2fea9bd4155d89c.zip | |
fix --wget and --curl in urpmi.update
| -rw-r--r-- | urpmi.spec | 5 | ||||
| -rwxr-xr-x | urpmi.update | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -7,7 +7,7 @@ ################################################################## %define name urpmi -%define version 4.4.3 +%define version 4.4.4 %define release 1mdk %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"') @@ -236,6 +236,9 @@ $urpm->update_media(nolock => 1, nopubkey => 1); %{compat_perl_vendorlib}/urpm/parallel_ssh.pm %changelog +* Wed Jan 28 2004 Olivier Blin <blino@mandrake.org> 4.4.4-1mdk +- fix --wget and --curl in urpmi.update + * Wed Jan 21 2004 Olivier Blin <blino@mandrake.org> 4.4.3-1mdk - add downloader option in global config section - better error reporting for curl diff --git a/urpmi.update b/urpmi.update index 99fb2856..b861657e 100755 --- a/urpmi.update +++ b/urpmi.update @@ -34,11 +34,8 @@ sub main { /^--?z$/ and ++$options{compress}, next; /^--update$/ and $options{update} = 1, next; /^--force-key$/ and $options{forcekey} = 1, next; - /^--wget$/ and $urpm->{sync} = sub { my $options = shift @_; - if (ref $options) { $options->{prefer} = 'wget' } - else { $options = { dir => $options, prefer => 'wget' } } - urpm::sync_webfetch($options, @_) }, next; - /^--curl$/ and $urpm->{sync} = \&urpm::sync_webfetch, next; + /^--wget$/ and $urpm->{options}{downloader} = 'wget', next; + /^--curl$/ and $urpm->{options}{downloader} = 'curl', next; /^--limit-rate$/ and do { $options{limit_rate} = shift @_; next }; /^--proxy$/ and do { my ($proxy, $port) = ($_ = shift @_) =~ m,^(?:http://)?([^:]+(:\d+)?)/*$, or |