src/libfetchers/fetchers.cc

@@ -185,14 +185,6 @@ std::pair<StorePath, Input> Input::fetchToStore(ref<Store> store) const
             auto narHash = store->queryPathInfo(storePath)->narHash;
             final.attrs.insert_or_assign("narHash", narHash.to_string(HashFormat::SRI, true));
 
-            // FIXME: we would like to mark inputs as final in
-            // getAccessorUnchecked(), but then we can't add
-            // narHash. Or maybe narHash should be excluded from the
-            // concept of "final" inputs?
-            final.attrs.insert_or_assign("final", Explicit<bool>(true));
-
-            assert(final.isFinal());
-
             scheme->checkLocks(*this, final);
 
             return {storePath, final};
@@ -236,6 +228,8 @@ void InputScheme::checkLocks(const Input & specified, const Input & final) const
                 final.to_string(), *prevRevCount);
     }
 
+    assert(final.isFinal());
+
     if (specified.isFinal() && specified.attrs != final.attrs)
         throw Error("fetching final input '%s' resulted in different input '%s'",
             attrsToJSON(specified.attrs), attrsToJSON(final.attrs));
@@ -271,7 +265,7 @@ std::pair<ref<SourceAccessor>, Input> Input::getAccessorUnchecked(ref<Store> sto
 
        FIXME: add a setting to disable this.
        FIXME: substituting may be slower than fetching normally,
-       e.g. for fetchers like Git that are incremental!
+       e.g. for fetchers like that Git that are incremental!
     */
     if (isFinal() && getNarHash()) {
         try {
@@ -297,6 +291,8 @@ std::pair<ref<SourceAccessor>, Input> Input::getAccessorUnchecked(ref<Store> sto
     assert(!accessor->fingerprint);
     accessor->fingerprint = scheme->getFingerprint(store, final);
 
+    final.attrs.insert_or_assign("final", Explicit<bool>(true));
+
     return {accessor, std::move(final)};
 }