picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #734 from bjornfor/hash-mismatch-message

Browse source 
Clarify error message for hash mismatches (again)
This commit is contained in:
Eelco Dolstra 2015-12-08 19:53:48 +01:00
parent d1e3bf01bc 65bd82d42a
commit 7431932b29
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -2736,8 +2736,8 @@ void DerivationGoal::registerOutputs()
Hash h2 = recursive ? hashPath(ht, actualPath).first : hashFile(ht, actualPath);
if (h != h2)
throw BuildError(
format("Nix expects output path ‘%1%’ to have %2% hash ‘%3%’, instead it has ‘%4%’")
% path % i.second.hashAlgo % printHash16or32(h) % printHash16or32(h2));
format("output path ‘%1%’ has %2% hash ‘%3%’ when ‘%4%’ was expected")
% path % i.second.hashAlgo % printHash16or32(h2) % printHash16or32(h));
}
/* Get rid of all weird permissions. This also checks that