Add makeFixedOutputPathFromCA function

This puts what we are already doing into a shared method. It just
needs a path name and a ca and produces a store path.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index bf005a3b3..9158a52e0 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -862,15 +862,10 @@ void LocalStore::querySubstitutablePathInfos(const StorePathSet & paths,
         for (auto & path : paths) {
             auto subPath(path.clone());
 
-            auto ca_ = pathsCA.find(printStorePath(path));
+            auto ca = pathsCA.find(printStorePath(path));
             // recompute store path so that we can use a different store root
-            if (ca_ != pathsCA.end()) {
-                auto ca(ca_->second);
-                if (!hasPrefix(ca, "fixed:"))
-                    continue;
-                FileIngestionMethod ingestionMethod { ca.compare(6, 2, "r:") == 0 };
-                Hash hash(std::string(ca, ingestionMethod == FileIngestionMethod::Recursive ? 8 : 6));
-                subPath = makeFixedOutputPath(ingestionMethod, hash, path.name());
+            if (ca != pathsCA.end() && (hasPrefix(ca->second, "fixed:") || hasPrefix(ca->second, "text:"))) {
+                subPath = makeFixedOutputPathFromCA(path.name(), ca->second);
                 if (subPath != path)
                     debug("replaced path '%s' with '%s' for substituter '%s'", printStorePath(path), sub->printStorePath(subPath), sub->getUri());
             } else if (sub->storeDir != storeDir) continue;