aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-16 11:49:12 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-16 11:49:12 +0100
commit5ac27053e9bc4722dde5bd3243488d8e9a0b4623 (patch)
tree383aa0f6b98ebc3d214f48f2fc4632ea54d510e7 /src/libstore/build.cc
parent92063851b1c49a5c96cf86b0b61d840dfe155964 (diff)
Rename ValidPathInfo::hash -> narHash for consistency
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 180a558dc..249ab2335 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -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;