From b6deca7c0dcf6e5f0da1d186dc1a1288325e1d88 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 1 Mar 2022 12:11:10 +0100
Subject: fetchTree: Use isValidPath, add comment

---
 src/libexpr/primops/fetchTree.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libexpr/primops')

diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index 2eeee7173..892c59fba 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -239,13 +239,14 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
             ? state.store->makeFixedOutputPath(FileIngestionMethod::Recursive, *expectedHash, name, {})
             : state.store->makeFixedOutputPath(FileIngestionMethod::Flat, *expectedHash, name, {});
 
-        auto validPaths = state.store->queryValidPaths({expectedPath}, NoSubstitute);
-        if (!validPaths.empty()) {
+        if (state.store->isValidPath(expectedPath)) {
             state.allowAndSetStorePathString(expectedPath, v);
             return;
         }
     }
 
+    // TODO: fetching may fail, yet the path may be substitutable.
+    //       https://github.com/NixOS/nix/issues/4313
     auto storePath =
         unpack
         ? fetchers::downloadTarball(state.store, *url, name, (bool) expectedHash).first.storePath
-- 
cgit v1.2.3