From 6c9ab48a926d2ed135a891a3abc48d8d9cd7f4c9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 27 Mar 2008 15:13:15 +0000
Subject: simple cleanup (would need some more)

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

(limited to 'urpm')

diff --git a/urpm/download.pm b/urpm/download.pm
index fb3a8c0b..801fc980 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -63,7 +63,8 @@ sub load_proxy_config () {
 
 #- writes proxy.cfg
 sub dump_proxy_config () {
-    return 0 unless defined $proxy_config; #- hasn't been read yet
+    $proxy_config or return 0; #- hasn't been read yet
+
     open my $f, '>', $PROXY_CFG or return 0;
     foreach ('', sort grep { !/^(|cmd_line)$/ } keys %$proxy_config) {
 	my $m = $_ eq '' ? '' : "$_:";
@@ -74,10 +75,9 @@ sub dump_proxy_config () {
 	}
 	if ($p->{ask}) {
 	    print $f "${m}proxy_user_ask\n";
-	    next;
+	} elsif (defined $p->{user} && $p->{user} ne '') {
+	    print $f "${m}proxy_user=$p->{user}:$p->{pwd}\n";
 	}
-	defined $p->{user} && $p->{user} ne ''
-	    and print $f "${m}proxy_user=$p->{user}:$p->{pwd}\n";
     }
     close $f;
     chmod 0600, $PROXY_CFG; #- may contain passwords
-- 
cgit v1.2.1