From fac63d6416ae0f7aec6c986d9d258b25047a24e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Jan 2007 16:57:43 +0000 Subject: [PATCH] * exportReferencesGraph: work on paths within store paths as well. --- src/libstore/build.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 9bcf336a4..1789eeda2 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1411,11 +1411,19 @@ void DerivationGoal::startBuilder() throw BuildError(format("odd number of tokens in `exportReferencesGraph': `%1%'") % s); for (Strings::iterator i = ss.begin(); i != ss.end(); ) { 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 */ + + /* 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; computeFSClosure(storePath, refs); /* !!! in secure Nix, the writing should be done on the