commit 02a945556e45e6e1711b260907f8ac22255ecc2c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 08 22:57:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 08 22:57:47 2018 +0000
tree 8e80f33d4570935a3786a4c811241810fd801b01
parent 481613b35f3f5c94b0890438a213a4f84863ca4a
parent e7b775ca2cae76d642715d0d740b8365b84f9b8f

Merge "Check and dump the signal info for killed updater."

install.cpp

diff --git a/install.cpp b/install.cpp
index e1e8ee8..680937d 100644
--- a/install.cpp
+++ b/install.cpp
@@ -497,9 +497,16 @@
   if (retry_update) {
     return INSTALL_RETRY;
   }
-  if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-    LOG(ERROR) << "Error in " << package << " (Status " << WEXITSTATUS(status) << ")";
+  if (WIFEXITED(status)) {
+    if (WEXITSTATUS(status) != EXIT_SUCCESS) {
+      LOG(ERROR) << "Error in " << package << " (status " << WEXITSTATUS(status) << ")";
+      return INSTALL_ERROR;
+    }
+  } else if (WIFSIGNALED(status)) {
+    LOG(ERROR) << "Error in " << package << " (killed by signal " << WTERMSIG(status) << ")";
     return INSTALL_ERROR;
+  } else {
+    LOG(FATAL) << "Invalid status code " << status;
   }
 
   return INSTALL_SUCCESS;