[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
338/376: Don't wait for PID -1
From: |
Ludovic Courtès |
Subject: |
338/376: Don't wait for PID -1 |
Date: |
Wed, 28 Jan 2015 22:06:02 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit e529823635c8efee0d96a73fb90117ac81040710
Author: Eelco Dolstra <address@hidden>
Date: Wed Dec 10 13:53:04 2014 +0100
Don't wait for PID -1
The pid field can be -1 if forking the substituter process failed.
---
src/libstore/local-store.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index fc48c04..9bd0317 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -358,7 +358,8 @@ LocalStore::~LocalStore()
i->second.to.close();
i->second.from.close();
i->second.error.close();
- i->second.pid.wait(true);
+ if (i->second.pid != -1)
+ i->second.pid.wait(true);
}
} catch (...) {
ignoreException();
- 340/376: Rename function, (continued)
- 340/376: Rename function, Ludovic Courtès, 2015/01/28
- 342/376: Don't do vfork in conjunction with setuid, Ludovic Courtès, 2015/01/28
- 341/376: Use vfork, Ludovic Courtès, 2015/01/28
- 345/376: allow custom docbook paths/URLs, use a working URL for docbook.rng, Ludovic Courtès, 2015/01/28
- 344/376: Urgh, Ludovic Courtès, 2015/01/28
- 343/376: Provide default pagers, Ludovic Courtès, 2015/01/28
- 346/376: Don't use ?=, Ludovic Courtès, 2015/01/28
- 347/376: Remove canary stuff, Ludovic Courtès, 2015/01/28
- 348/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 350/376: Doh, Ludovic Courtès, 2015/01/28
- 338/376: Don't wait for PID -1,
Ludovic Courtès <=
- 352/376: Get rid of unnecessary "interrupted by the user" message with -vvv, Ludovic Courtès, 2015/01/28
- 353/376: Don't abort if we get a signal while waiting for the pager, Ludovic Courtès, 2015/01/28
- 351/376: Remove chatty message, Ludovic Courtès, 2015/01/28
- 356/376: Shut up a Valgrind warning, Ludovic Courtès, 2015/01/28
- 349/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 355/376: Fix some memory leaks, Ludovic Courtès, 2015/01/28
- 357/376: Silence some warnings on GCC 4.9, Ludovic Courtès, 2015/01/28
- 358/376: Install cacert before running nix-channel, Ludovic Courtès, 2015/01/28
- 359/376: Better error message, Ludovic Courtès, 2015/01/28
- 362/376: Undocument nix-generate-patches, Ludovic Courtès, 2015/01/28