Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addToStore(): Take explicit name argument

Browse Source
This commit is contained in:
Eelco Dolstra
2015-03-25 17:06:12 +01:00
parent 5114a07d95
commit 7ea6ecf855
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libexpr/eval.cc
View File

@@ -1419,7 +1419,7 @@ string EvalState::copyPathToStore(PathSet & context, const Path & path)
else {
dstPath = settings.readOnlyMode
? computeStorePathForPath(checkSourcePath(path)).first
: store->addToStore(checkSourcePath(path), true, htSHA256, defaultPathFilter, repair);
: store->addToStore(baseNameOf(path), checkSourcePath(path), true, htSHA256, defaultPathFilter, repair);
srcToStore[path] = dstPath;
printMsg(lvlChatty, format("copied source ‘%1%’ -> ‘%2%’")
% path % dstPath);

2
src/libexpr/primops.cc
View File

@@ -943,7 +943,7 @@ static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args
Path dstPath = settings.readOnlyMode
? computeStorePathForPath(path, true, htSHA256, filter).first
: store->addToStore(path, true, htSHA256, filter, state.repair);
: store->addToStore(baseNameOf(path), path, true, htSHA256, filter, state.repair);
mkString(v, dstPath, singleton<PathSet>(dstPath));
}