wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Rename ValidPathInfo::hash -> narHash for consistency

Browse source
This commit is contained in:
Eelco Dolstra 2016-02-16 11:49:12 +01:00
parent 92063851b1
commit 5ac27053e9
8 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build.cc
View file

@ -2735,7 +2735,7 @@ void DerivationGoal::registerOutputs()
if (buildMode == bmCheck) {
if (!worker.store.isValidPath(path)) continue;
ValidPathInfo info = worker.store.queryPathInfo(path);
if (hash.first != info.hash) {
if (hash.first != info.narHash) {
if (settings.keepFailed) {
Path dst = path + checkSuffix;
if (pathExists(dst)) deletePath(dst);
@ -2799,7 +2799,7 @@ void DerivationGoal::registerOutputs()
ValidPathInfo info;
info.path = path;
info.hash = hash.first;
info.narHash = hash.first;
info.narSize = hash.second;
info.references = references;
info.deriver = drvPath;
@ -3369,7 +3369,7 @@ void SubstitutionGoal::finished()
ValidPathInfo info2;
info2.path = storePath;
info2.hash = hash.first;
info2.narHash = hash.first;
info2.narSize = hash.second;
info2.references = info.references;
info2.deriver = info.deriver;