about summary refs log tree commit diff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-08T18·53+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-08T18·53+0100
commit7431932b29d7a0be3a1fdb10f7d5dc1ea6dbd366 (patch)
treedd81fd76f2723c1d2190d4d3e6a34418682f4046 /src/libstore/build.cc
parentd1e3bf01bce7d8502610532077f6f55c3df4de2c (diff)
parent65bd82d42ac3f546c678fc36ca035525da7bc079 (diff)
Merge pull request #734 from bjornfor/hash-mismatch-message
Clarify error message for hash mismatches (again)
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 1c751ab98734..70c4540bcdf1 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -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