about summary refs log tree commit diff
path: root/src/libstore/download.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-02-16T13·46+0100
committerEelco Dolstra <edolstra@gmail.com>2017-02-16T13·50+0100
commitcde4b609192d11dc299ea3c27d7f92735f161db1 (patch)
tree97b19b5ddce360fa68eb46036f364b716c2ea182 /src/libstore/download.cc
parentbd5388e7b22daa2d22c21578ef5735be8b8353a6 (diff)
Move netrcFile to Settings
Also get rid of Settings::processEnvironment(), it appears to be
useless.
Diffstat (limited to 'src/libstore/download.cc')
-rw-r--r--src/libstore/download.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index d65ac7b873dc..d301d4409b03 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -232,11 +232,8 @@ struct CurlDownloader : public Downloader
             }
 
             /* If no file exist in the specified path, curl continues to work
-             * anyway as if netrc support was disabled. */
-            Path netrcFile = settings.get("netrc-file",
-               (format("%1%/%2%") % settings.nixConfDir % "netrc").str());
-            /* Curl copies the given C string, so the following call is safe. */
-            curl_easy_setopt(req, CURLOPT_NETRC_FILE, netrcFile.c_str());
+               anyway as if netrc support was disabled. */
+            curl_easy_setopt(req, CURLOPT_NETRC_FILE, settings.netrcFile.c_str());
             curl_easy_setopt(req, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
 
             result.data = std::make_shared<std::string>();