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

Simplify

Browse source 
With BSD locks we don't have to guard against reading our own
temproots.
This commit is contained in:
Eelco Dolstra 2019-08-02 18:37:55 +02:00
parent e349f2c0a3
commit a2597d5f27
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/gc.cc
View file

@ -221,8 +221,6 @@ void LocalStore::findTempRoots(FDs & fds, Roots & tempRoots, bool censor)
//FDPtr fd(new AutoCloseFD(openLockFile(path, false)));
//if (*fd == -1) continue;
if (path != fnTempRoots) {
/* Try to acquire a write lock without blocking. This can
only succeed if the owning process has died. In that case
we don't care about its temporary roots. */
@ -239,8 +237,6 @@ void LocalStore::findTempRoots(FDs & fds, Roots & tempRoots, bool censor)
debug(format("waiting for read lock on '%1%'") % path);
lockFile(fd->get(), ltRead, true);
}
/* Read the entire file. */
string contents = readFile(fd->get());