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

* exportReferencesGraph: work on paths within store paths as well.

Browse source
This commit is contained in:
Eelco Dolstra 2007-01-23 16:57:43 +00:00
parent bae75ca5a1
commit fac63d6416
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/build.cc
View file

@ -1411,11 +1411,19 @@ void DerivationGoal::startBuilder()
throw BuildError(format("odd number of tokens in `exportReferencesGraph': `%1%'") % s); throw BuildError(format("odd number of tokens in `exportReferencesGraph': `%1%'") % s);
for (Strings::iterator i = ss.begin(); i != ss.end(); ) { for (Strings::iterator i = ss.begin(); i != ss.end(); ) {
string fileName = *i++; string fileName = *i++;
Path storePath = *i++;
if (!store->isValidPath(storePath))
throw BuildError(format("`exportReferencesGraph' refers to an invalid path `%1%'")
% storePath);
checkStoreName(fileName); /* !!! abuse of this function */ checkStoreName(fileName); /* !!! abuse of this function */
/* Check that the store path is valid. */
Path storePath = *i++;
if (!isInStore(storePath))
throw BuildError(format("`exportReferencesGraph' contains a non-store path `%1%'")
% storePath);
storePath = toStorePath(storePath);
if (!store->isValidPath(storePath))
throw BuildError(format("`exportReferencesGraph' contains an invalid path `%1%'")
% storePath);
/* Write closure info to `fileName'. */
PathSet refs; PathSet refs;
computeFSClosure(storePath, refs); computeFSClosure(storePath, refs);
/* !!! in secure Nix, the writing should be done on the /* !!! in secure Nix, the writing should be done on the