From b8812baad9cca68f3b50ddb9a5f484a2ac73de06 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 29 May 2006 13:26:08 +0000
Subject: Patch by Vincent Panel from bug #22000: use global proxy settings
 when adding a media; load it if necessary to avoid overwriting it.

---
 urpm/download.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'urpm/download.pm')

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->{''};
     }
 }
 
-- 
cgit v1.2.1