lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-store -r: Respect --add-root for non-derivations

Browse source 
Fixes #68.
Fixes #117.
This commit is contained in:
Eelco Dolstra 2014-02-26 16:32:46 +01:00
parent 7f74513b4e
commit 6b9cd59a41
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix-store/nix-store.cc
View file

@ -61,7 +61,7 @@ static Path useDeriver(Path path)
/* Realise the given path. For a derivation that means build it; for /* Realise the given path. For a derivation that means build it; for
other paths it means ensure their validity. */ other paths it means ensure their validity. */
static PathSet realisePath(const Path & path, bool build = true) static PathSet realisePath(Path path, bool build = true)
{ {
DrvPathWithOutputs p = parseDrvPathWithOutputs(path); DrvPathWithOutputs p = parseDrvPathWithOutputs(path);
@ -95,6 +95,14 @@ static PathSet realisePath(const Path & path, bool build = true)
else { else {
if (build) store->ensurePath(path); if (build) store->ensurePath(path);
else if (!store->isValidPath(path)) throw Error(format("path `%1%' does not exist and cannot be created") % path); else if (!store->isValidPath(path)) throw Error(format("path `%1%' does not exist and cannot be created") % path);
if (gcRoot == "")
printGCWarning();
else {
Path rootName = gcRoot;
rootNr++;
if (rootNr > 1) rootName += "-" + int2String(rootNr);
path = addPermRoot(*store, path, rootName, indirectRoot);
}
return singleton<PathSet>(path); return singleton<PathSet>(path);
} }
} }