From 7f103dcddd4cf3c0748b7a379a117f3262c4c5f7 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:11:05 +0200
Subject: Properly filter the stores according to their declared uriSchemes

When opening a store, only try the stores whose `uriSchemes()` include
the current one
---
 src/libstore/ssh-store.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libstore/ssh-store.cc')

diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index da201a9c3..13265e127 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -22,7 +22,7 @@ class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
-    SSHStore(const std::string & host, const Params & params)
+    SSHStore([[maybe_unused]] const std::string & scheme, const std::string & host, const Params & params)
         : StoreConfig(params)
         , Store(params)
         , RemoteStoreConfig(params)
@@ -38,11 +38,11 @@ public:
     {
     }
 
-    static std::vector<std::string> uriPrefixes() { return {"ssh-ng"}; }
+    static std::set<std::string> uriSchemes() { return {"ssh-ng"}; }
 
     std::string getUri() override
     {
-        return uriPrefixes()[0] + "://" + host;
+        return *uriSchemes().begin() + "://" + host;
     }
 
     bool sameMachine() override
-- 
cgit v1.2.3