maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move netrcFile to Settings

Browse source 
Also get rid of Settings::processEnvironment(), it appears to be
useless.
This commit is contained in:
Eelco Dolstra 2017-02-16 14:46:36 +01:00
parent bd5388e7b2
commit cde4b60919
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
5 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/download.cc
View file

@ -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>();