downloadCached: Return ETag

(cherry picked from commit 529add316c)
2019-06-24 21:58:33 +02:00
parent 94f11d0a61
commit dc29e9fb47
6 changed files with 29 additions and 12 deletions
@@ -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, "" };