summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpmi.spec5
-rwxr-xr-xurpmi.update7
2 files changed, 6 insertions, 6 deletions
diff --git a/urpmi.spec b/urpmi.spec
index 4a08dc8c..df3dad32 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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