openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/libnetwork.lib: curl.download(): do use the curl options set by the function argument '--options' (or '-o') instead of the global variable ''

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-10-20 12:28:30 +02:00
parent 5d684cd01a
commit 770a201882
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -43,6 +43,10 @@ Changes in version 1.12.6
when the URL contains the letter '&'. when the URL contains the letter '&'.
(Problem pointed out by Silvan Calarco.) (Problem pointed out by Silvan Calarco.)
* lib/libnetwork.lib - Davide Madrisan:
curl.download(): do use the curl options set by the function argument
'--options' (or '-o') instead of the global variable '$curl_options'.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in version 1.12.5 Changes in version 1.12.5

4
lib/libnetwork.lib.in
View File

@ -602,10 +602,10 @@ function curl.download() {
pushd $destdir >/dev/null pushd $destdir >/dev/null
local retval local retval
notify.debug "curl $curl_options\ notify.debug "curl $curl_opts\
${proxy:+ --proxy $proxy}${proxyuser:+ --proxy-user $proxy_user} $file_url" ${proxy:+ --proxy $proxy}${proxyuser:+ --proxy-user $proxy_user} $file_url"
curl $curl_options \ curl $curl_opts \
${proxy:+ --proxy $proxy} ${proxyuser:+ --proxy-user $proxy_user} \ ${proxy:+ --proxy $proxy} ${proxyuser:+ --proxy-user $proxy_user} \
"$file_url" "$file_url"
retval=$? retval=$?