lulu-berlin/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Don't anticipate hash algo without hash in derivation for now

Browse source 
When we merge with master, the new lack of string types make this case
impossible (after parsing). Later, when we actually implemenent
CA-derivations, we'll change the types to allow that.
This commit is contained in:
John Ericson 2020-06-21 21:05:37 +00:00
parent 49308ef039
commit 3804e3df9b
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/derivations.cc
View file

@ -359,22 +359,10 @@ DerivationType BasicDerivation::type() const
outputs.begin()->second.hash != "") outputs.begin()->second.hash != "")
{ {
return DerivationType::CAFixed; return DerivationType::CAFixed;
} } else {
auto const algo = outputs.begin()->second.hashAlgo;
if (algo != "") {
throw Error("Invalid mix of CA and regular outputs");
}
for (auto & i : outputs) {
if (i.second.hash != "") {
throw Error("Non-fixed-output derivation has fixed output");
}
if (i.second.hashAlgo != "") {
throw Error("Invalid mix of CA and regular outputs");
}
}
return DerivationType::Regular; return DerivationType::Regular;
} }
}
DrvHashes drvHashes; DrvHashes drvHashes;