diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-29 07:16:51 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-29 07:16:51 +0000 |
| commit | c9e1ae1c9a310d2d1f237646ed381632cf071d4a (patch) | |
| tree | 650ee1fa057c3ca2905ac318c173578d314e8773 /urpm.pm | |
| parent | e1d903c8ea73f57ca704720dacc747c66a785a32 (diff) | |
| download | urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.gz urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.bz2 urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.xz urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.zip | |
Support for setting proxy per-media in proxy.cfg
Diffstat (limited to 'urpm.pm')
| -rw-r--r-- | urpm.pm | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -678,7 +678,7 @@ sub add_distrib_media { quiet => 1, limit_rate => $options{limit_rate}, compress => $options{compress}, - proxy => $urpm->{proxy}, + proxy => get_proxy(), }, reduce_pathname("$url/Mandrake/base/hdlists"), ); @@ -1218,7 +1218,7 @@ this could happen if you mounted manually the directory when creating the medium quiet => 1, limit_rate => $options{limit_rate}, compress => $options{compress}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, reduce_pathname("$medium->{url}/../descriptions"), @@ -1248,7 +1248,7 @@ this could happen if you mounted manually the directory when creating the medium quiet => 1, limit_rate => $options{limit_rate}, compress => $options{compress}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, reduce_pathname("$medium->{url}/$medium->{with_hdlist}/../MD5SUM"), @@ -1348,7 +1348,7 @@ this could happen if you mounted manually the directory when creating the medium limit_rate => $options{limit_rate}, compress => $options{compress}, callback => $options{callback}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, reduce_pathname("$medium->{url}/$with_hdlist"), @@ -1388,7 +1388,7 @@ this could happen if you mounted manually the directory when creating the medium limit_rate => $options{limit_rate}, compress => $options{compress}, callback => $options{callback}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, reduce_pathname("$medium->{url}/$medium->{with_hdlist}"), @@ -1455,7 +1455,7 @@ this could happen if you mounted manually the directory when creating the medium quiet => 1, limit_rate => $options{limit_rate}, compress => $options{compress}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, $_ @@ -1483,7 +1483,7 @@ this could happen if you mounted manually the directory when creating the medium quiet => 1, limit_rate => $options{limit_rate}, compress => $options{compress}, - proxy => $urpm->{proxy}, + proxy => get_proxy($medium->{name}), media => $medium->{name}, }, $_, @@ -1875,7 +1875,7 @@ sub register_rpms { unlink "$urpm->{cachedir}/partial/$basename"; eval { $urpm->{log}(N("retrieving rpm file [%s] ...", $_)); - $urpm->{sync}({ dir => "$urpm->{cachedir}/partial", quiet => 1, proxy => $urpm->{proxy} }, $_); + $urpm->{sync}({ dir => "$urpm->{cachedir}/partial", quiet => 1, proxy => get_proxy() }, $_); $urpm->{log}(N("...retrieving done")); $_ = "$urpm->{cachedir}/partial/$basename"; }; @@ -2575,7 +2575,7 @@ sub download_packages_of_distant_media { resume => $options{resume}, compress => $options{compress}, callback => $options{callback}, - proxy => $urpm->{proxy}, + proxy => get_proxy($urpm->{media}[$_]{name}), media => $urpm->{media}[$_]{name}, }, values %distant_sources, |