From 770a201882bd754f147257fc2029b631eff7d77b Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Sat, 20 Oct 2012 12:28:30 +0200
Subject: [PATCH] lib/libnetwork.lib: curl.download(): do use the curl options
 set by the function argument '--options' (or '-o') instead of the global
 variable ''

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog             | 4 ++++
 lib/libnetwork.lib.in | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7af6983..02a3001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,10 @@ Changes in version 1.12.6
     when the URL contains the letter '&'.
     (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
diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in
index 382512b..d8f1471 100644
--- a/lib/libnetwork.lib.in
+++ b/lib/libnetwork.lib.in
@@ -602,10 +602,10 @@ function curl.download() {
    pushd $destdir >/dev/null
 
    local retval
-   notify.debug "curl $curl_options\
+   notify.debug "curl $curl_opts\
 ${proxy:+ --proxy $proxy}${proxyuser:+ --proxy-user $proxy_user} $file_url"
 
-   curl $curl_options \
+   curl $curl_opts \
       ${proxy:+ --proxy $proxy} ${proxyuser:+ --proxy-user $proxy_user} \
       "$file_url"
    retval=$?