wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00
Code Activity

* Add missing files to dist.

Browse source 
* Fix GC and substitute bugs related to self-references.  Add a
  regression test.
This commit is contained in:
Eelco Dolstra 2005-02-01 09:23:38 +00:00
parent 32fa82a56a
commit 06b4424286
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build.cc
View file

@ -1329,7 +1329,8 @@ void SubstitutionGoal::init()
for (PathSet::iterator i = references.begin();
i != references.end(); ++i)
addWaitee(worker.makeSubstitutionGoal(*i));
if (*i != storePath) /* ignore self-references */
addWaitee(worker.makeSubstitutionGoal(*i));
if (waitees.empty()) /* to prevent hang (no wake-up event) */
referencesValid();
@ -1347,7 +1348,8 @@ void SubstitutionGoal::referencesValid()
for (PathSet::iterator i = references.begin();
i != references.end(); ++i)
assert(isValidPath(*i));
if (*i != storePath) /* ignore self-references */
assert(isValidPath(*i));
tryNext();
}