lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

CachedDownloadResult: Include store path

Browse source 
Also, make fetchGit and fetchMercurial update allowedPaths properly.

(Maybe the evaluator, rather than the caller of the evaluator, should
apply toRealPath(), but that's a bigger change.)

(cherry picked from commit 5c34d66538)
This commit is contained in:
Eelco Dolstra 2019-05-15 15:38:24 +02:00
parent dc29e9fb47
commit b43e1e186e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops/fetchGit.cc
View file

@ -235,7 +235,7 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
v.attrs->sort(); v.attrs->sort();
if (state.allowedPaths) if (state.allowedPaths)
state.allowedPaths->insert(gitInfo.storePath); state.allowedPaths->insert(state.store->toRealPath(gitInfo.storePath));
} }
static RegisterPrimOp r("fetchGit", 1, prim_fetchGit); static RegisterPrimOp r("fetchGit", 1, prim_fetchGit);

2
src/libexpr/primops/fetchMercurial.cc
View file

@ -214,7 +214,7 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
v.attrs->sort(); v.attrs->sort();
if (state.allowedPaths) if (state.allowedPaths)
state.allowedPaths->insert(hgInfo.storePath); state.allowedPaths->insert(state.store->toRealPath(hgInfo.storePath));
} }
static RegisterPrimOp r("fetchMercurial", 1, prim_fetchMercurial); static RegisterPrimOp r("fetchMercurial", 1, prim_fetchMercurial);

2
src/libstore/download.cc
View file

@ -804,6 +804,7 @@ CachedDownloadResult Downloader::downloadCached(ref<Store> store, const string &
expectedStorePath = store->makeFixedOutputPath(unpack, expectedHash, name); expectedStorePath = store->makeFixedOutputPath(unpack, expectedHash, name);
if (store->isValidPath(expectedStorePath)) { if (store->isValidPath(expectedStorePath)) {
CachedDownloadResult result; CachedDownloadResult result;
result.storePath = expectedStorePath;
result.path = store->toRealPath(expectedStorePath); result.path = store->toRealPath(expectedStorePath);
return result; return result;
} }
@ -912,6 +913,7 @@ CachedDownloadResult Downloader::downloadCached(ref<Store> store, const string &
url, expectedHash.to_string(), gotHash.to_string()); url, expectedHash.to_string(), gotHash.to_string());
} }
result.storePath = storePath;
result.path = store->toRealPath(storePath); result.path = store->toRealPath(storePath);
return result; return result;
} }

3
src/libstore/download.hh
View file

@ -43,6 +43,9 @@ struct DownloadResult
struct CachedDownloadResult struct CachedDownloadResult
{ {
// Note: 'storePath' may be different from 'path' when using a
// chroot store.
Path storePath;
Path path; Path path;
std::optional<std::string> etag; std::optional<std::string> etag;
}; };