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

Before adjusting computeFSClosure

Browse source
This commit is contained in:
Wouter den Breejen 2007-06-29 14:56:32 +00:00
parent b32691da2b
commit 7eb2f61797
5 changed files with 68 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,18 +29,32 @@ static Path gcRoot;
static int rootNr = 0;
static bool indirectRoot = false;
//Fixes the path and checks if it is a store path , see also toStorePath
static Path fixPath(Path path)
{
path = absPath(path);
while (!isInStore(path)) {
if (!isLink(path)) break;
if (!isLink(path))
break;
string target = readLink(path);
path = absPath(target, dirOf(path));
}
return toStorePath(path);
}
//Fixes the path and checks if it is a store or state path
static Path fixStoreOrStatePath(Path path)
{
path = absPath(path);
while (!isInStore(path) && !isInStateStore(path)) {
if (!isLink(path))
break;
string target = readLink(path);
path = absPath(target, dirOf(path));
}
return toStoreOrStatePath(path);
}
static Path useDeriver(Path path)
{
@ -162,10 +176,13 @@ static void opPrintFixedPath(Strings opFlags, Strings opArgs)
parseHash16or32(parseHashType(hashAlgo), hash), name);
}
/*
* .....??
*/
static Path maybeUseOutput(const Path & storePath, bool useOutput, bool forceRealise)
{
if (forceRealise) realisePath(storePath);
if (forceRealise)
realisePath(storePath);
if (useOutput && isDerivation(storePath)) {
Derivation drv = derivationFromPath(storePath);
return findOutput(drv, "out");
@ -286,7 +303,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); ++i)
{
Path path = maybeUseOutput(fixPath(*i), useOutput, forceRealise); //TODO This hangs on state paths ...
Path path = maybeUseOutput(fixStoreOrStatePath(*i), useOutput, forceRealise);
if (query == qRequisites) store->storePathRequisites(path, includeOutputs, paths, false);
else if (query == qRequisitesState) store->storePathStateRequisitesOnly(path, includeOutputs, paths);
else if (query == qRequisitesFull) store->storePathRequisites(path, includeOutputs, paths, true);
@ -339,7 +356,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
}
break;
case qTree: {
case qTree: { //TODO include state path?
PathSet done;
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); ++i)
@ -347,7 +364,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
break;
}
case qGraph: {
case qGraph: { //TOOD include state path?
PathSet roots;
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); ++i)