forked from lix-project/lix
Merge branch 'hash-mismatch' of git://github.com/LnL7/nix
This commit is contained in:
commit
58f9ae0dcd
|
@ -734,8 +734,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);
|
||||||
|
|
Loading…
Reference in a new issue