mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

download: make hash mismatch error consistent with fetchurl

Browse source
This commit is contained in:
Daiderd Jordan 2018-04-20 21:07:32 +02:00
parent 9296186c75
commit 13d4d1c0a2
No known key found for this signature in database
GPG key ID: D02435D05B810C96
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/download.cc
View file

@ -730,8 +730,8 @@ Path Downloader::downloadCached(ref<Store> store, const string & url_, bool unpa
Hash gotHash = unpack Hash gotHash = unpack
? hashPath(expectedHash.type, store->toRealPath(storePath)).first ? hashPath(expectedHash.type, store->toRealPath(storePath)).first
: hashFile(expectedHash.type, store->toRealPath(storePath)); : hashFile(expectedHash.type, store->toRealPath(storePath));
throw nix::Error("hash mismatch in file downloaded from '%s': expected hash '%s', got '%s'", throw nix::Error("hash mismatch in file downloaded from '%s': got hash '%s' instead of the expected hash '%s'",
url, expectedHash.to_string(), gotHash.to_string()); url, gotHash.to_string(), expectedHash.to_string());
} }
return store->toRealPath(storePath); return store->toRealPath(storePath);