wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

* Option --force-realise' in nix-store --query'.

Browse source
This commit is contained in:
Eelco Dolstra 2004-01-09 14:18:28 +00:00
parent 30b31a8f61
commit 46a71c857c
4 changed files with 98 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/nix-store/main.cc
View file

@ -61,9 +61,14 @@ static void opAdd(Strings opFlags, Strings opArgs)
}
Path maybeNormalise(const Path & ne, bool normalise)
Path maybeNormalise(const Path & ne, bool normalise, bool realise)
{
return normalise ? normaliseStoreExpr(ne) : ne;
if (realise) {
Path ne2 = normaliseStoreExpr(ne);
realiseClosure(ne2);
return normalise ? ne2 : ne;
} else
return normalise ? normaliseStoreExpr(ne) : ne;
}
@ -73,6 +78,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
enum { qList, qRequisites, qPredecessors, qGraph
} query = qList;
bool normalise = false;
bool realise = false;
bool includeExprs = true;
bool includeSuccessors = false;
@ -83,6 +89,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
else if (*i == "--predecessors") query = qPredecessors;
else if (*i == "--graph") query = qGraph;
else if (*i == "--normalise" || *i == "-n") normalise = true;
else if (*i == "--force-realise" || *i == "-f") realise = true;
else if (*i == "--exclude-exprs") includeExprs = false;
else if (*i == "--include-successors") includeSuccessors = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
@ -94,7 +101,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
i != opArgs.end(); i++)
{
StringSet paths = storeExprRoots(
maybeNormalise(checkPath(*i), normalise));
maybeNormalise(checkPath(*i), normalise, realise));
for (StringSet::iterator j = paths.begin();
j != paths.end(); j++)
cout << format("%s\n") % *j;
@ -108,7 +115,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
i != opArgs.end(); i++)
{
StringSet paths2 = storeExprRequisites(
maybeNormalise(checkPath(*i), normalise),
maybeNormalise(checkPath(*i), normalise, realise),
includeExprs, includeSuccessors);
paths.insert(paths2.begin(), paths2.end());
}
@ -134,7 +141,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
PathSet roots;
for (Strings::iterator i = opArgs.begin();
i != opArgs.end(); i++)
roots.insert(maybeNormalise(checkPath(*i), normalise));
roots.insert(maybeNormalise(checkPath(*i), normalise, realise));
printDotGraph(roots);
break;
}