aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-15 02:23:39 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-15 02:23:39 +0000
commit4636cc9a1f6de70947abbfb17a0ad91981d1cad7 (patch)
treed4654a69b75d35a310500265b0a0ad905382a202
parent47f0d7b79833c3b5934c768fcc4b65223c8a7c4b (diff)
parent10e81bf871551901ff0383bdede0f79325e93867 (diff)
Merge remote-tracking branch 'obsidian/path-info' into ca-drv-exotic
-rw-r--r--src/libstore/local-store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index f573845f1..b26167aca 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1071,7 +1071,7 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
deletePath(realPath);
// text hashing has long been allowed to have non-self-references because it is used for drv files.
- if (info.ca.has_value() && !info.references.empty() && !(std::holds_alternative<TextHash>(*info.ca) && info.hasSelfReference))
+ if (info.ca.has_value() && !info.references.empty() && !(std::holds_alternative<TextHash>(*info.ca) && !info.hasSelfReference))
settings.requireExperimentalFeature("ca-references");
/* While restoring the path from the NAR, compute the hash