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/download.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/download.pm')
| -rw-r--r-- | urpm/download.pm | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 4308f9f6..8f46df6d 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -47,12 +47,27 @@ sub load_proxy_config () { sub get_proxy (;$) { my ($o_media) = @_; $o_media ||= ''; load_proxy_config(); - return $proxy_config->{$o_media} || { - http_proxy => undef , - ftp_proxy => undef , + return $proxy_config->{cmd_line} + || $proxy_config->{$o_media} + || $proxy_config->{''} + || { + http_proxy => undef, + ftp_proxy => undef, + user => undef, + pwd => undef, + }; +} + +#- overrides the config file proxy settings with values passed via command-line +sub set_cmdline_proxy { + my (%h) = @_; + $proxy_config->{cmd_line} ||= { + http_proxy => undef, + ftp_proxy => undef, user => undef, - pwd => undef + pwd => undef, }; + $proxy_config->{cmd_line}{$_} = $h{$_} for keys %h; } #- set up the environment for proxy usage for the appropriate tool. |