nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 04:30:59 +01:00
Code Activity

registerValidPath can now also take state paths as arguments, nix-store still cannot

Browse source
This commit is contained in:
Wouter den Breejen 2007-06-28 18:59:07 +00:00
parent 04dd3fdf34
commit b32691da2b
7 changed files with 149 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libstore/store-api.cc
View file

@ -20,6 +20,13 @@ bool isInStore(const Path & path)
&& path[nixStore.size()] == '/';
}
bool isInStateStore(const Path & path)
{
return path[0] == '/'
&& string(path, 0, nixStoreState.size()) == nixStoreState
&& path.size() >= nixStoreState.size() + 2
&& path[nixStoreState.size()] == '/';
}
bool isStorePath(const Path & path)
{
@ -27,11 +34,22 @@ bool isStorePath(const Path & path)
&& path.find('/', nixStore.size() + 1) == Path::npos;
}
bool isStatePath(const Path & path)
{
return isInStateStore(path)
&& path.find('/', nixStoreState.size() + 1) == Path::npos;
}
void assertStorePath(const Path & path)
{
if (!isStorePath(path))
throw Error(format("path `%1%' is not in the Nix store (1)") % path); //TODO bug: this prints an empty path ...
throw Error(format("component path `%1%' is not in the Nix store (1)") % path); //TODO bug: this prints an empty path ...
}
void assertStatePath(const Path & path)
{
if (!isStatePath(path))
throw Error(format("state path `%1%' is not in the Nix state-store (1)") % path); //TODO bug: this prints an empty path ...
}