Add StorePathCAMap for querySubstitutablePathInfos

I’m not 100% sure this is wanted since it kind of makes everything
have to know about ca even if they don’t really want to. But it also
make things easier in dealing with looking up ca.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 6902dfa0c..dc991e227 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -178,10 +178,7 @@ void Store::queryMissing(const std::vector<StorePathWithOutputs> & targets,
         auto outPath = parseStorePath(outPathS);
 
         SubstitutablePathInfos infos;
-        std::map<std::string, std::string> pathsCA = {};
-        if (auto ca = getDerivationCA(*drv))
-            pathsCA.insert({outPathS, *ca});
-        querySubstitutablePathInfos({outPath}, infos, pathsCA);
+        querySubstitutablePathInfos({{outPath, getDerivationCA(*drv)}}, infos);
 
         if (infos.empty()) {
             drvState_->lock()->done = true;
@@ -238,7 +235,7 @@ void Store::queryMissing(const std::vector<StorePathWithOutputs> & targets,
             if (isValidPath(path.path)) return;
 
             SubstitutablePathInfos infos;
-            querySubstitutablePathInfos({path.path}, infos);
+            querySubstitutablePathInfos({{path.path, std::nullopt}}, infos);
 
             if (infos.empty()) {
                 auto state(state_.lock());