From f1861b083972db049e61385b2170f2e60a7f0b53 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Tue, 17 Sep 2002 16:01:46 +0000 Subject: 4.0-20mdk --- urpm.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'urpm.pm') diff --git a/urpm.pm b/urpm.pm index c6d6d88e..5f5e0f44 100644 --- a/urpm.pm +++ b/urpm.pm @@ -161,7 +161,7 @@ sub set_proxy { /wget/ && do { for ($proxy->{proxy}) { if (defined $_->{http_proxy}) { - $ENV{http_proxy} = $_->{http_proxy} =~ /^http:\/\// ? $_->{http_proxy} : "http://$_->{http_proxy}"; + $ENV{http_proxy} = $_->{http_proxy} =~ /^http:/ ? $_->{http_proxy} : "http://$_->{http_proxy}"; } $ENV{ftp_proxy} = $_->{ftp_proxy} if defined $_->{ftp_proxy}; @res = ("--proxy-user=$_->{user}", "--proxy-passwd=$_->{pwd}") if defined $_->{user} && defined $_->{pwd}; @@ -170,9 +170,9 @@ sub set_proxy { }; /curl/ && do { for ($proxy->{proxy}) { - push @res, "-x $_->{http_proxy}" if defined $_->{http_proxy}; - push @res, "-x $_->{ftp_proxy}" if defined $_->{ftp_proxy}; - push @res, "-U $_->{user}:$_->{pwd}" if defined $_->{user} && defined $_->{pwd}; + push @res, ('-x', $_->{http_proxy}) if defined $_->{http_proxy}; + push @res, ('-x', $_->{ftp_proxy}) if defined $_->{ftp_proxy}; + push @res, ('-U', "$_->{user}:$_->{pwd}") if defined $_->{user} && defined $_->{pwd}; } last; }; -- cgit v1.2.1