diff options
author | Mandrake <mandrake@mandriva.com> | 2006-10-26 20:23:21 +0000 |
---|---|---|
committer | Mandrake <mandrake@mandriva.com> | 2006-10-26 20:23:21 +0000 |
commit | afa71f536d3707bba84a7717683b3090c73a78e5 (patch) | |
tree | a2cf1d5464db7a5558c8cad5069d18f1ff79f0da /urpm.pm | |
parent | f7248aabb16ba627fe3f2b3362e6c452956dbb6e (diff) | |
download | urpmi-afa71f536d3707bba84a7717683b3090c73a78e5.tar urpmi-afa71f536d3707bba84a7717683b3090c73a78e5.tar.gz urpmi-afa71f536d3707bba84a7717683b3090c73a78e5.tar.bz2 urpmi-afa71f536d3707bba84a7717683b3090c73a78e5.tar.xz urpmi-afa71f536d3707bba84a7717683b3090c73a78e5.zip |
Copying release 0.9.6-2mdv2007.1 to pristine/ directory.
Diffstat (limited to 'urpm.pm')
-rw-r--r-- | urpm.pm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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'); |