aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/ssh-store.cc
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2020-09-11 11:11:05 +0200
committerregnat <rg@regnat.ovh>2020-09-16 13:53:09 +0200
commit7f103dcddd4cf3c0748b7a379a117f3262c4c5f7 (patch)
tree7288d4b6552bb45be7c0dfa1e985340769e2f114 /src/libstore/ssh-store.cc
parent5895184df44e86ae55270390402c8263b0f24ae2 (diff)
Properly filter the stores according to their declared uriSchemes
When opening a store, only try the stores whose `uriSchemes()` include the current one
Diffstat (limited to 'src/libstore/ssh-store.cc')
-rw-r--r--src/libstore/ssh-store.cc6
1 files changed, 3 insertions, 3 deletions
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