summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-08-26 22:26:49 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-08-27 08:09:22 -0400
commit8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf (patch)
tree7adc72f75f7ee66f94c8807fc5c0e728d7d2c3da
parenta56002865ce32c338ca9e7e8de880afc8ec3940c (diff)
downloadurpmi-8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf.tar
urpmi-8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf.tar.gz
urpmi-8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf.tar.bz2
urpmi-8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf.tar.xz
urpmi-8a252bf031a37e0151a1ead1dd0adf5ce6f2acaf.zip
fix using a proxy without an auth user (mga#11265)
-rw-r--r--NEWS3
-rw-r--r--urpm/download.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 7c4915f0..85fcd573 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- aria2 downloading:
+ o fix using a proxy without an auth user (mga#11265)
+
Version 8.06 - 18 May 2015
- updated translations
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");
}