lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 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
Show stats 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(); for (PathSet::iterator i = references.begin();
i != references.end(); ++i) 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) */ if (waitees.empty()) /* to prevent hang (no wake-up event) */
referencesValid(); referencesValid();
@ -1347,7 +1348,8 @@ void SubstitutionGoal::referencesValid()
for (PathSet::iterator i = references.begin(); for (PathSet::iterator i = references.begin();
i != references.end(); ++i) i != references.end(); ++i)
assert(isValidPath(*i)); if (*i != storePath) /* ignore self-references */
assert(isValidPath(*i));
tryNext(); tryNext();
} }

5
src/libstore/store.cc
View file

@ -553,7 +553,10 @@ void deleteFromStore(const Path & _path)
Transaction txn(nixDB); Transaction txn(nixDB);
if (isValidPathTxn(txn, path)) { 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); throw Error(format("cannot delete path `%1%' because it is in use") % path);
invalidatePath(path, txn); invalidatePath(path, txn);
} }

3
tests/Makefile.am
View file

@ -39,7 +39,7 @@ gc-concurrent.sh: gc-concurrent.nix gc-concurrent2.nix
TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \ TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \
build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \ build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \
gc-concurrent.sh verify.sh nix-pull.sh gc-concurrent.sh verify.sh nix-pull.sh
#TESTS = init.sh gc-concurrent.sh #TESTS = init.sh nix-push.sh nix-pull.sh
XFAIL_TESTS = XFAIL_TESTS =
@ -57,5 +57,6 @@ EXTRA_DIST = $(TESTS) \
substitutes.nix.in substituter.sh \ substitutes.nix.in substituter.sh \
substitutes2.nix.in substituter2.sh \ substitutes2.nix.in substituter2.sh \
gc-concurrent.nix.in gc-concurrent.builder.sh \ gc-concurrent.nix.in gc-concurrent.builder.sh \
gc-concurrent2.nix.in gc-concurrent2.builder.sh \
fallback.nix.in \ fallback.nix.in \
$(wildcard lang/*.nix) $(wildcard lang/*.exp) $(wildcard lang/*.nix) $(wildcard lang/*.exp)

5
tests/dependencies.builder0.sh
View file

@ -3,4 +3,7 @@ export PATH=/bin:/usr/bin:$PATH
mkdir $out mkdir $out
echo $(cat $input1/foo)$(cat $input2/bar) > $out/foobar echo $(cat $input1/foo)$(cat $input2/bar) > $out/foobar
ln -s $input2 $out/input-2 ln -s $input2 $out/input-2
# Self-reference.
ln -s $out $out/self