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
@@ -2083,7 +2083,7 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
    if (evalSettings.pureEval && !expectedHash)
        throw Error("in pure evaluation mode, '%s' requires a 'sha256' argument", who);

-    Path res = getDownloader()->downloadCached(state.store, url, unpack, name, expectedHash);
+    Path res = getDownloader()->downloadCached(state.store, url, unpack, name, expectedHash).path;

    if (state.allowedPaths)
        state.allowedPaths->insert(res);