wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Revert "Revert "Merge pull request #9546 from NixOS/nixos-23.11""

Browse source 
This reverts commit d6d7d2cb46.
This commit is contained in:
John Ericson 2024-02-29 14:52:31 -05:00
parent d6d7d2cb46
commit 5a2985431c
7 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/local-store.cc
View file

@ -1208,7 +1208,7 @@ StorePath LocalStore::addToStoreFromDump(
Path tempDir;
AutoCloseFD tempDirFd;
bool methodsMatch = (FileIngestionMethod) dumpMethod == hashMethod;
bool methodsMatch = ContentAddressMethod(FileIngestionMethod(dumpMethod)) == hashMethod;
/* If the methods don't match, our streaming hash of the dump is the
wrong sort, and we need to rehash. */