Merge branch 'hash-mismatch' of git://github.com/LnL7/nix
This commit is contained in:
		
						commit
						58f9ae0dcd
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue