about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/normalise.cc4
-rw-r--r--src/libstore/store.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/normalise.cc b/src/libstore/normalise.cc
index 56ce5da7d10a..1632ad1fb6ce 100644
--- a/src/libstore/normalise.cc
+++ b/src/libstore/normalise.cc
@@ -501,7 +501,7 @@ void NormalisationGoal::buildDone()
     debug(format("builder process for `%1%' finished") % nePath);
 
     /* Check the exit status. */
-    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+    if (!statusOk(status)) {
         deleteTmpDir(false);
         throw Error(format("builder for `%1%' %2%")
             % nePath % statusToString(status));
@@ -1371,7 +1371,7 @@ void SubstitutionGoal::finished()
     debug(format("substitute for `%1%' finished") % storePath);
 
     /* Check the exit status. */
-    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+    if (!statusOk(status))
         throw Error(format("builder for `%1%' %2%")
             % storePath % statusToString(status));
 
diff --git a/src/libstore/store.cc b/src/libstore/store.cc
index 2ec93d63bcbc..9677f8422313 100644
--- a/src/libstore/store.cc
+++ b/src/libstore/store.cc
@@ -161,7 +161,7 @@ void copyPath(const Path & src, const Path & dst)
 
     /* Wait for the child to finish. */
     int status = pid.wait(true);
-    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+    if (!statusOk(status))
         throw Error(format("cannot copy `%1% to `%2%': child %3%")
             % src % dst % statusToString(status));
 }