diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-24T15·39+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-24T15·39+0100 |
commit | e76df9bd5285272f025025d97fe8993156726eef (patch) | |
tree | a69540de6de9682cbcb81d3a7e037bda4ac1f90c /src/libstore | |
parent | 1c718f80d3e91c6dd8f1337f81b37e4837384c75 (diff) |
Register content-addressability assertion for fixed outputs
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/build.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 1ce23135fc37..eef9549669b5 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2753,6 +2753,8 @@ void DerivationGoal::registerOutputs() Path path = i.second.path; if (missingPaths.find(path) == missingPaths.end()) continue; + ValidPathInfo info; + Path actualPath = path; if (useChroot) { actualPath = chrootRootDir + path; @@ -2855,6 +2857,8 @@ void DerivationGoal::registerOutputs() format("output path ‘%1%’ has %2% hash ‘%3%’ when ‘%4%’ was expected") % path % i.second.hashAlgo % printHash16or32(h2) % printHash16or32(h)); } + + info.ca = makeFixedOutputCA(recursive, h2); } /* Get rid of all weird permissions. This also checks that @@ -2954,7 +2958,6 @@ void DerivationGoal::registerOutputs() worker.markContentsGood(path); } - ValidPathInfo info; info.path = path; info.narHash = hash.first; info.narSize = hash.second; |