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

* Regression fix: realise substitutes and detect cycles.

Browse source
This commit is contained in:
Eelco Dolstra 2004-02-13 10:45:09 +00:00
parent 1ad9d11247
commit 6f5a5ea5ea
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/normalise.cc
View file

@ -288,6 +288,12 @@ void ensurePath(const Path & path, PathSet pending)
/* If the path is already valid, we're done. */ /* If the path is already valid, we're done. */
if (isValidPath(path)) return; if (isValidPath(path)) return;
if (pending.find(path) != pending.end())
throw Error(format(
"path `%1%' already being realised (possible substitute cycle?)")
% path);
pending.insert(path);
/* Otherwise, try the substitutes. */ /* Otherwise, try the substitutes. */
Paths subPaths = querySubstitutes(path); Paths subPaths = querySubstitutes(path);
@ -296,7 +302,8 @@ void ensurePath(const Path & path, PathSet pending)
{ {
checkInterrupt(); checkInterrupt();
try { try {
normaliseStoreExpr(*i, pending); Path nf = normaliseStoreExpr(*i, pending);
realiseClosure(nf, pending);
if (isValidPath(path)) return; if (isValidPath(path)) return;
throw Error(format("substitute failed to produce expected output path")); throw Error(format("substitute failed to produce expected output path"));
} catch (Error & e) { } catch (Error & e) {