Add function for quoting strings

(cherry picked from commit 7dcf5b011a0942ecf953f2b607c4c8d0e9e652c7)

2 files changed, 2 insertions, 7 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9c6aedfa5..7efa81a62 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1904,7 +1904,7 @@ void DerivationGoal::startBuilder()
             concatStringsSep(", ", parsedDrv->getRequiredSystemFeatures()),
             worker.store.printStorePath(drvPath),
             settings.thisSystem,
-            concatStringsSep(", ", settings.systemFeatures));
+            concatStringsSep<StringSet>(", ", settings.systemFeatures));
 
     if (drv->isBuiltin())
         preloadNSS();
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index b043feb0a..aacbe5e0b 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -741,12 +741,7 @@ std::string Store::showPaths(const StorePathSet & paths)
 
 string showPaths(const PathSet & paths)
 {
-    string s;
-    for (auto & i : paths) {
-        if (s.size() != 0) s += ", ";
-        s += "'" + i + "'";
-    }
-    return s;
+    return concatStringsSep(", ", quoteStrings(paths));
 }