01/13: Revert "nix: Guard against removing temporary roots of living processes."

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit eec920ba93ecb086366576e31b785962fbaf81c2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Oct 17 09:36:43 2022 +0200

    Revert "nix: Guard against removing temporary roots of living processes."
    
    This reverts commit bb0beaecdee1a2315a1269b1746d238c8ab0e699.  This
    change broke a number of tests that assumed the previous behavior.
---
 nix/libstore/gc.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index f101de92d6..16519116e4 100644
--- a/nix/libstore/gc.cc
+++ b/nix/libstore/gc.cc
@@ -2,7 +2,6 @@
 #include "misc.hh"
 #include "local-store.hh"
 
-#include <string>
 #include <functional>
 #include <queue>
 #include <algorithm>
@@ -227,10 +226,10 @@ static void readTempRoots(PathSet & tempRoots, FDs & fds)
         //FDPtr fd(new AutoCloseFD(openLockFile(path, false)));
         //if (*fd == -1) continue;
 
-        /* Try to acquire a write lock without blocking.  This can only
-           succeed if the owning process has died, in which case we don't care
-           about its temporary roots, or if we are the owning process.  */
-        if (i.name != std::to_string(getpid()) && lockFile(*fd, ltWrite, 
false)) {
+        /* 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. */
+        if (lockFile(*fd, ltWrite, false)) {
             printMsg(lvlError, format("removing stale temporary roots file 
`%1%'") % path);
             unlink(path.c_str());
             writeFull(*fd, "d");