TarballInputScheme: Fix fetchToStore() caching

edolstra · May 3, 2024 · 299d0b7 · 299d0b7
1 parent 7332321
commit 299d0b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
@@ -248,7 +248,9 @@ std::pair<ref<InputAccessor>, Input> Input::getAccessorUnchecked(ref<Store> stor
 
     auto [accessor, final] = scheme->getAccessor(store, *this);
 
-    accessor->fingerprint = scheme->getFingerprint(store, final);
+    if (!accessor->fingerprint)
+        // FIXME: remove getFingerprint()?
+        accessor->fingerprint = scheme->getFingerprint(store, final);
 
     return {accessor, std::move(final)};
 }

diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
@@ -352,8 +352,11 @@ struct TarballInputScheme : CurlInputScheme
         if (result.lastModified && !input.attrs.contains("lastModified"))
             input.attrs.insert_or_assign("lastModified", uint64_t(result.lastModified));
 
-        input.attrs.insert_or_assign("narHash",
-            getTarballCache()->treeHashToNarHash(result.treeHash).to_string(HashFormat::SRI, true));
+        auto narHash = getTarballCache()->treeHashToNarHash(result.treeHash).to_string(HashFormat::SRI, true);
+
+        input.attrs.insert_or_assign("narHash", narHash);
+
+        result.accessor->fingerprint = narHash;
 
         return {result.accessor, input};
     }