diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-05-29 13:26:08 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-05-29 13:26:08 +0000 |
| commit | b8812baad9cca68f3b50ddb9a5f484a2ac73de06 (patch) | |
| tree | a1ba40e37e5cef1a7dc1031e28b9be441ccdad16 /urpm/download.pm | |
| parent | b9b5c5206c998a95ea7e379c9d57977b8534bd0c (diff) | |
| download | urpmi-b8812baad9cca68f3b50ddb9a5f484a2ac73de06.tar urpmi-b8812baad9cca68f3b50ddb9a5f484a2ac73de06.tar.gz urpmi-b8812baad9cca68f3b50ddb9a5f484a2ac73de06.tar.bz2 urpmi-b8812baad9cca68f3b50ddb9a5f484a2ac73de06.tar.xz urpmi-b8812baad9cca68f3b50ddb9a5f484a2ac73de06.zip | |
Patch by Vincent Panel from bug #22000: use global proxy settings when
adding a media; load it if necessary to avoid overwriting it.
Diffstat (limited to 'urpm/download.pm')
| -rw-r--r-- | urpm/download.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 81a45f93..ace58c44 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -116,9 +116,13 @@ sub get_proxy (;$) { sub copy_cmd_line_proxy { my ($media) = @_; return unless $media; + load_proxy_config(); if (defined $proxy_config->{cmd_line}) { $proxy_config->{$media} = $proxy_config->{cmd_line}; dump_proxy_config(); + } else { + #- use default if available + $proxy_config->{$media} = $proxy_config->{''}; } } |