summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-08 15:55:16 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-08 15:55:16 +0000
commitbdbddec4a5a570a5fbcb631c270d20829510cd47 (patch)
tree9a38bdee630c2bc9986d2d7d0989bee35ad84069
parentbe1a53d6b4c54d18f97188ba0db7b258a60ba9ac (diff)
downloadurpmi-bdbddec4a5a570a5fbcb631c270d20829510cd47.tar
urpmi-bdbddec4a5a570a5fbcb631c270d20829510cd47.tar.gz
urpmi-bdbddec4a5a570a5fbcb631c270d20829510cd47.tar.bz2
urpmi-bdbddec4a5a570a5fbcb631c270d20829510cd47.tar.xz
urpmi-bdbddec4a5a570a5fbcb631c270d20829510cd47.zip
urpmi.addmedia with proxy did erase the previous proxy settings (bug 20108)
-rw-r--r--urpm/download.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/urpm/download.pm b/urpm/download.pm
index c703cf39..009c2139 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -125,6 +125,7 @@ sub copy_cmd_line_proxy {
#- overrides the config file proxy settings with values passed via command-line
sub set_cmdline_proxy {
my (%h) = @_;
+ load_proxy_config();
$proxy_config->{cmd_line} ||= {
http_proxy => undef,
ftp_proxy => undef,