maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 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();
}

5
src/libstore/store.cc
View file

@ -553,7 +553,10 @@ void deleteFromStore(const Path & _path)
Transaction txn(nixDB);
if (isValidPathTxn(txn, path)) {
if (getReferers(txn, path).size() > 0)
PathSet referers = getReferers(txn, path);
if (referers.size() > 1 ||
(referers.size() == 1 &&
*referers.begin() != path))
throw Error(format("cannot delete path `%1%' because it is in use") % path);
invalidatePath(path, txn);
}