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

Remove the remaining occurenceses of a NarHash modulo

Browse source
This commit is contained in:
regnat 2021-05-26 09:39:29 +02:00
parent 79ae9e4558
commit 129384bcf3
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/local-store.cc
View file

@ -1436,14 +1436,10 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
/* Check the content hash (optionally - slow). */ /* Check the content hash (optionally - slow). */
printMsg(lvlTalkative, "checking contents of '%s'", printStorePath(i)); printMsg(lvlTalkative, "checking contents of '%s'", printStorePath(i));
std::unique_ptr<AbstractHashSink> hashSink; auto hashSink = HashSink(info->narHash.type);
if (!info->ca || !info->references.count(info->path))
hashSink = std::make_unique<HashSink>(info->narHash.type);
else
hashSink = std::make_unique<HashModuloSink>(info->narHash.type, std::string(info->path.hashPart()));
dumpPath(Store::toRealPath(i), *hashSink); dumpPath(Store::toRealPath(i), hashSink);
auto current = hashSink->finish(); auto current = hashSink.finish();
if (info->narHash != nullHash && info->narHash != current.first) { if (info->narHash != nullHash && info->narHash != current.first) {
printError("path '%s' was modified! expected hash '%s', got '%s'", printError("path '%s' was modified! expected hash '%s', got '%s'",

10
src/nix/verify.cc
View file

@ -97,15 +97,11 @@ struct CmdVerify : StorePathsCommand
if (!noContents) { if (!noContents) {
std::unique_ptr<AbstractHashSink> hashSink; auto hashSink = HashSink(info->narHash.type);
if (!info->ca)
hashSink = std::make_unique<HashSink>(info->narHash.type);
else
hashSink = std::make_unique<HashModuloSink>(info->narHash.type, std::string(info->path.hashPart()));
store->narFromPath(info->path, *hashSink); store->narFromPath(info->path, hashSink);
auto hash = hashSink->finish(); auto hash = hashSink.finish();
if (hash.first != info->narHash) { if (hash.first != info->narHash) {
corrupted++; corrupted++;