aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/derivations.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore/derivations.cc')
-rw-r--r--src/libstore/derivations.cc16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 9864cf63e..f985e7ae5 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -359,21 +359,9 @@ DerivationType BasicDerivation::type() const
outputs.begin()->second.hash != "")
{
return DerivationType::CAFixed;
+ } else {
+ return DerivationType::Regular;
}
-
- 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;
}