moraxyc/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix add-to-store --flat to put in correct hash

Browse source
This commit is contained in:
Matthew Bauer 2020-06-12 15:25:29 -05:00
parent 5b386b05f5
commit e3cb536f19
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/add-to-store.cc
View file

@ -53,14 +53,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand
auto narHash = hashString(htSHA256, *sink.s); auto narHash = hashString(htSHA256, *sink.s);
ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, narHash, *namePart));
info.narHash = narHash;
info.narSize = sink.s->size();
Hash hash; Hash hash;
switch (ingestionMethod) { switch (ingestionMethod) {
case FileIngestionMethod::Recursive: { case FileIngestionMethod::Recursive: {
hash = info.narHash; hash = narHash;
break; break;
} }
case FileIngestionMethod::Flat: { case FileIngestionMethod::Flat: {
@ -70,6 +66,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand
break; break;
} }
} }
ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, hash, *namePart));
info.narHash = narHash;
info.narSize = sink.s->size();
info.ca = makeFixedOutputCA(ingestionMethod, hash); info.ca = makeFixedOutputCA(ingestionMethod, hash);
if (!dryRun) { if (!dryRun) {