Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix

1 files changed, 6 insertions, 7 deletions

diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index faa2b83c37..32244b2185 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -708,17 +708,14 @@ void AutoCloseDir::close()
 
 
 Pid::Pid()
+    : pid(-1), separatePG(false), killSignal(SIGKILL)
 {
-    pid = -1;
-    separatePG = false;
-    killSignal = SIGKILL;
 }
 
 
 Pid::Pid(pid_t pid)
+    : pid(pid), separatePG(false), killSignal(SIGKILL)
 {
-    Pid();
-    *this = pid;
 }
 
 
@@ -857,8 +854,10 @@ pid_t startProcess(std::function<void()> fun, const string & errorPrefix)
             restoreAffinity();
             fun();
         } catch (std::exception & e) {
-            writeToStderr(errorPrefix + string(e.what()) + "\n");
-        }
+            try {
+                std::cerr << errorPrefix << e.what() << "\n";
+            } catch (...) { }
+        } catch (...) { }
         _exit(1);
     }