[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/118: Don't wait for PID -1
From: |
Ludovic Courtès |
Subject: |
118/118: Don't wait for PID -1 |
Date: |
Tue, 19 May 2015 14:46:08 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 3bfa70b7963e12be346900e64ae45fa019850675
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.
---
nix/libstore/local-store.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index e3de33b..c262b81 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/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();
- 106/118: Improved error message when encountering unsupported file types, (continued)
- 106/118: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/05/19
- 114/118: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/05/19
- 99/118: Add an 'optimiseStore' remote procedure call., Ludovic Courtès, 2015/05/19
- 107/118: Fix build on gcc < 4.7, Ludovic Courtès, 2015/05/19
- 98/118: Add disallowedReferences / disallowedRequisites, Ludovic Courtès, 2015/05/19
- 110/118: Make ~DerivationGoal more reliable, Ludovic Courtès, 2015/05/19
- 111/118: Don't use ADDR_LIMIT_3GB, Ludovic Courtès, 2015/05/19
- 115/118: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/05/19
- 117/118: Build derivations in a more predictable order, Ludovic Courtès, 2015/05/19
- 109/118: nix-store --gc: Don't warn about missing manifests directory, Ludovic Courtès, 2015/05/19
- 118/118: Don't wait for PID -1,
Ludovic Courtès <=
- 112/118: Fix message, Ludovic Courtès, 2015/05/19
- 116/118: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/05/19