From 8528697f7a1209761058dcb15897dab8bc87b158 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 26 Aug 2015 22:26:49 +0200
Subject: fix using a proxy without an auth user (mga#11265)

---
 NEWS             | 2 ++
 urpm/download.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 723559e7..9df6e000 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- aria2 downloading:
+  o fix using a proxy without an auth user (mga#11265)
 - testsuite:
   o misc enhancements & cleanups
   o fix tests for ignored faillure for %pre{,un}, %pretrans
diff --git a/urpm/download.pm b/urpm/download.pm
index 31a88264..8fe9256d 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -278,7 +278,7 @@ sub set_proxy {
 	if (my ($http_proxy) = $p->{http_proxy} && parse_http_proxy($p->{http_proxy})) {
 	    my $allproxy = $p->{user}; 
 	    $allproxy .= ":" . $p->{pwd} if $p->{pwd}; 
-	    $allproxy .= "@";
+	    $allproxy .= "@" if $p->{user};
 	    $allproxy .= $http_proxy;
 	    @res = ("--all-proxy=http://$allproxy");
 	}
-- 
cgit v1.2.1