philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

download: improve error for hash mismatch ("store mismatch")

Browse source 
Fixes #1905
This commit is contained in:
Will Dietz 2018-03-22 09:56:54 -05:00
parent 59b32403f2
commit 74da813912
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/download.cc
View file

@ -726,8 +726,13 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
storePath = unpackedStorePath; storePath = unpackedStorePath;
} }
if (expectedStorePath != "" && storePath != expectedStorePath) if (expectedStorePath != "" && storePath != expectedStorePath) {
throw nix::Error("store path mismatch in file downloaded from '%s'", url); 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());
}
return store->toRealPath(storePath); return store->toRealPath(storePath);
} }