about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-04-23T12·40-0400
committerShea Levy <shea@shealevy.com>2018-04-23T12·40-0400
commit58f9ae0dcda30666373179b4fe6955e66edfca28 (patch)
tree52c28d7784706780a08a8891ee0e5e95e05769d6
parent655058b8a1e9466fe46bdc2b7466f4c1f60f3188 (diff)
parent13d4d1c0a2489a5fab506da57149863daf7f01b1 (diff)
Merge branch 'hash-mismatch' of git://github.com/LnL7/nix
-rw-r--r--src/libstore/download.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 58fd8eedeca9..18f9094f82e0 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -734,8 +734,8 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
         Hash gotHash = unpack
             ? hashPath(expectedHash.type, store->toRealPath(storePath)).first
             : hashFile(expectedHash.type, store->toRealPath(storePath));
-        throw nix::Error("hash mismatch in file downloaded from '%s': expected hash '%s', got '%s'",
-            url, expectedHash.to_string(), gotHash.to_string());
+        throw nix::Error("hash mismatch in file downloaded from '%s': got hash '%s' instead of the expected hash '%s'",
+            url, gotHash.to_string(), expectedHash.to_string());
     }
 
     return store->toRealPath(storePath);