wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 13:41:15 +02:00
Code Activity

downloadCached: Return ETag

Browse source 
(cherry picked from commit 529add316c)
This commit is contained in:
Eelco Dolstra 2019-02-25 23:20:50 +08:00
parent 94f11d0a61
commit dc29e9fb47
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/parser.y
View file

@ -677,7 +677,7 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
if (isUri(elem.second)) {
try {
res = { true, getDownloader()->downloadCached(store, elem.second, true) };
res = { true, getDownloader()->downloadCached(store, elem.second, true).path };
} catch (DownloadError & e) {
printError(format("warning: Nix search path entry '%1%' cannot be downloaded, ignoring") % elem.second);
res = { false, "" };