max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-30 09:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'allow-relative-paths-in-store-option' into remove-storetype-delegate-regStore

Browse source
This commit is contained in:
John Ericson 2020-07-21 15:55:27 +00:00
commit 02639716ea
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/local-store.cc
View file

@ -1579,6 +1579,14 @@ void LocalStore::createUser(const std::string & userName, uid_t userId)
} }
} }
static bool isNonUriPath(const std::string & spec) {
return
// is not a URL
spec.find("://") == std::string::npos
// Has at least one path separator, and so isn't a single word that
// might be special like "auto"
&& spec.find("/") != std::string::npos;
}
static RegisterStoreImplementation regStore([]( static RegisterStoreImplementation regStore([](
const std::string & uri, const Store::Params & params) const std::string & uri, const Store::Params & params)
@ -1586,9 +1594,7 @@ static RegisterStoreImplementation regStore([](
{ {
Store::Params params2 = params; Store::Params params2 = params;
if (uri == "local") { if (uri == "local") {
} else if (hasPrefix(uri, "/")) { } else if (isNonUriPath(uri)) {
params2["root"] = uri;
} else if (hasPrefix(uri, "./")) {
params2["root"] = absPath(uri); params2["root"] = absPath(uri);
} else { } else {
return nullptr; return nullptr;