From afa71f536d3707bba84a7717683b3090c73a78e5 Mon Sep 17 00:00:00 2001 From: Mandrake Date: Thu, 26 Oct 2006 20:23:21 +0000 Subject: Copying release 0.9.6-2mdv2007.1 to pristine/ directory. --- urpm.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/urpm.pm b/urpm.pm index 3e5c2f7a..1fa28377 100644 --- a/urpm.pm +++ b/urpm.pm @@ -63,12 +63,15 @@ sub sync_webfetch { dir => "$urpm->{cachedir}/partial", limit_rate => $std_options->{limit_rate}, compress => $std_options->{compress}, - retry => $urpm->{options}{retry}, proxy => get_proxy($medium), quiet => $std_options->{quiet}, #- often overridden in the caller, why?? $medium ? (media => $medium->{name}) : (), %more_options, ); + foreach my $cpt (qw(retry wget-options curl-options rsync-options prozilla-options)) { + $options{$cpt} = $urpm->{options}{$cpt} if defined $urpm->{options}{$cpt}; + } + _sync_webfetch_raw($urpm, $files, \%options); } @@ -88,9 +91,6 @@ sub _sync_webfetch_raw { $urpm->{fatal}(10, $@) if $@; delete @files{qw(removable file)}; } - foreach my $cpt (qw(wget-options curl-options rsync-options prozilla-options)) { - $options->{$cpt} = $urpm->{options}{$cpt} if defined $urpm->{options}{$cpt}; - } if ($files{ftp} || $files{http} || $files{https}) { my @webfetch = qw(curl wget prozilla); my %webfetch_executables = (curl => 'curl', wget => 'wget', prozilla => 'proz'); -- cgit v1.2.1