diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-06-19 14:05:29 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-06-19 14:05:29 +0000 |
| commit | 4cc76b752b5d41dc764cf718058aa19d9a93dd3c (patch) | |
| tree | 4a306abcf67b6eecec6c5d5b8964f9d800f0a87e | |
| parent | 292aafac2d25081aed17a71f5b055deba8369358 (diff) | |
| download | urpmi-4cc76b752b5d41dc764cf718058aa19d9a93dd3c.tar urpmi-4cc76b752b5d41dc764cf718058aa19d9a93dd3c.tar.gz urpmi-4cc76b752b5d41dc764cf718058aa19d9a93dd3c.tar.bz2 urpmi-4cc76b752b5d41dc764cf718058aa19d9a93dd3c.tar.xz urpmi-4cc76b752b5d41dc764cf718058aa19d9a93dd3c.zip | |
fix aria2 proxy parameters
| -rw-r--r-- | urpm/download.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index 54ceb4db..fa67e171 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -249,11 +249,12 @@ sub set_proxy { push @res, '-H', 'Pragma:' if @res; } elsif ($proxy->{type} =~ /\baria2\b/) { if (my ($http_proxy) = $p->{http_proxy} && parse_http_proxy($p->{http_proxy})) { - push @res, ('--http-proxy', $http_proxy); + my $allproxy = $p->{user}; + $allproxy .= ":" . $p->{pwd} if $p->{pwd}; + $allproxy .= "@"; + $allproxy .= $http_proxy; + @res = ("--all-proxy=http://$allproxy"); } - push @res, ('--http-proxy', $p->{ftp_proxy}) if defined $p->{ftp_proxy}; - push @res, ("--http-proxy-user=$p->{user}", "--http-proxy-passwd=$p->{pwd}") - if defined $p->{user} && defined $p->{pwd}; } else { die N("Unknown webfetch `%s' !!!\n", $proxy->{type}); } |