Merge pull request #707 from peti/master

src/libstore/build.cc: clarify error message for hash mismatches
This commit is contained in:
Eelco Dolstra 2015-11-19 13:49:57 +01:00
commit 33f2fbcb62

View file

@ -2708,7 +2708,7 @@ void DerivationGoal::registerOutputs()
Hash h2 = recursive ? hashPath(ht, actualPath).first : hashFile(ht, actualPath); Hash h2 = recursive ? hashPath(ht, actualPath).first : hashFile(ht, actualPath);
if (h != h2) if (h != h2)
throw BuildError( throw BuildError(
format("output path %1% should have %2% hash %3%, instead has %4%") format("Nix expects output path %1% to have %2% hash %3%, instead it has %4%")
% path % i.second.hashAlgo % printHash16or32(h) % printHash16or32(h2)); % path % i.second.hashAlgo % printHash16or32(h) % printHash16or32(h2));
} }