wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 10:31:15 +02:00
Code Activity

Properly filter the stores according to their declared uriSchemes

Browse source 
When opening a store, only try the stores whose `uriSchemes()` include
the current one
This commit is contained in:
regnat 2020-09-11 11:11:05 +02:00
parent 5895184df4
commit 7f103dcddd
10 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/legacy-ssh-store.cc
View file

@ -41,9 +41,9 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
SSHMaster master;
static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
static std::set<std::string> uriSchemes() { return {"ssh"}; }
LegacySSHStore(const string & host, const Params & params)
LegacySSHStore(const string & scheme, const string & host, const Params & params)
: StoreConfig(params)
, LegacySSHStoreConfig(params)
, Store(params)
@ -92,7 +92,7 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
string getUri() override
{
return uriPrefixes()[0] + "://" + host;
return *uriSchemes().begin() + "://" + host;
}
void queryPathInfoUncached(const StorePath & path,