about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-03-03T18·23+0100
committerEelco Dolstra <edolstra@gmail.com>2017-03-03T18·23+0100
commitd3eb1cf3bbf57a33ac2e71a19a150c077011ecd9 (patch)
tree82cc4504c8de781beaa7ebbb23081152692b54d8 /src/libstore
parentd140c75530d385431850bed2f2c250f889c43c2f (diff)
build-remote: Don't use a SSH master
This is unnecessary because we make only one connection.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/store-api.cc4
-rw-r--r--src/libstore/store-api.hh2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 401b001b2d8f..9c755965e45b 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -708,7 +708,11 @@ ref<Store> openStore(const std::string & uri_)
         }
         uri = uri_.substr(0, q);
     }
+    return openStore(uri, params);
+}
 
+ref<Store> openStore(const std::string & uri, const Store::Params & params)
+{
     for (auto fun : *RegisterStoreImplementation::implementations) {
         auto store = fun(uri, params);
         if (store) return ref<Store>(store);
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index c344b9d66ed3..481d0b799068 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -642,6 +642,8 @@ void removeTempRoots();
    set to true *unless* you're going to collect garbage. */
 ref<Store> openStore(const std::string & uri = getEnv("NIX_REMOTE"));
 
+ref<Store> openStore(const std::string & uri, const Store::Params & params);
+
 
 void copyPaths(ref<Store> from, ref<Store> to, const Paths & storePaths, bool substitute = false);