lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Inline unkownHashes

Browse source 
See https://github.com/NixOS/nix/pull/4056#discussion_r493661632
This commit is contained in:
regnat 2020-09-24 10:11:58 +02:00
parent c092fa4702
commit bc081bcd81
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/derivations.cc
View file

@ -475,8 +475,6 @@ static const DrvHashModulo & pathDerivationModulo(Store & store, const StorePath
return h->second; return h->second;
} }
UnknownHashes unknownHashes;
/* See the header for interface details. These are the implementation details. /* See the header for interface details. These are the implementation details.
For fixed-output derivations, each hash in the map is not the For fixed-output derivations, each hash in the map is not the
@ -499,7 +497,7 @@ DrvHashModulo hashDerivationModulo(Store & store, const Derivation & drv, bool m
/* Return a fixed hash for fixed-output derivations. */ /* Return a fixed hash for fixed-output derivations. */
switch (drv.type()) { switch (drv.type()) {
case DerivationType::CAFloating: case DerivationType::CAFloating:
return unknownHashes; return UnknownHashes {};
case DerivationType::CAFixed: { case DerivationType::CAFixed: {
std::map<std::string, Hash> outputHashes; std::map<std::string, Hash> outputHashes;
for (const auto & i : drv.outputs) { for (const auto & i : drv.outputs) {
@ -545,7 +543,7 @@ DrvHashModulo hashDerivationModulo(Store & store, const Derivation & drv, bool m
}, },
}, res); }, res);
if (hasUnknownHash) { if (hasUnknownHash) {
return unknownHashes; return UnknownHashes {};
} }
} }