summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-09-18 07:56:51 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.com>2006-09-18 07:56:51 +0000
commit310bd5c03a5f47b69cf8ad67de8c9e7823063cd4 (patch)
tree1374ec89c99d18fe02501bda0ff7723d8ab1c2b2
parent51a80f01a5df599e0b24b765bec2f9ccf5bbcdaf (diff)
downloadurpmi-310bd5c03a5f47b69cf8ad67de8c9e7823063cd4.tar
urpmi-310bd5c03a5f47b69cf8ad67de8c9e7823063cd4.tar.gz
urpmi-310bd5c03a5f47b69cf8ad67de8c9e7823063cd4.tar.bz2
urpmi-310bd5c03a5f47b69cf8ad67de8c9e7823063cd4.tar.xz
urpmi-310bd5c03a5f47b69cf8ad67de8c9e7823063cd4.zip
Patch by Nicolas Melay to include -q to the command-line options of curl, so
the ~/.curlrc file isn't read.
-rw-r--r--urpm/download.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/urpm/download.pm b/urpm/download.pm
index e8d92825..57bd191b 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -304,6 +304,7 @@ sub sync_curl {
#- prepare to get back size and time stamp of each file.
open my $curl, join(" ", map { "'$_'" } "/usr/bin/curl",
+ "-q", # don't read .curlrc; some toggle options might interfer
($options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()),
($options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()),
($options->{retry} ? ('--retry', $options->{retry}) : ()),
@@ -362,6 +363,7 @@ sub sync_curl {
my @l = (@ftp_files, @other_files);
my ($buf, $file); $buf = '';
my $curl_pid = open my $curl, join(" ", map { "'$_'" } "/usr/bin/curl",
+ "-q", # don't read .curlrc; some toggle options might interfer
($options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()),
($options->{resume} ? ("--continue-at", "-") : ()),
($options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()),