Merge "Add a default error code when updater script aborts"

am: 89394632b1

Change-Id: Iceebf87fb62b1c2a23e20c2b4966606c0c7b0a72

error_code.h

@@ -24,6 +24,7 @@ enum ErrorCode {
   kZipOpenFailure,
   kBootreasonInBlacklist,
   kPackageCompatibilityFailure,
+  kScriptExecutionFailure,
 };
 
 enum CauseCode {

updater/updater.cpp

@@ -193,13 +193,15 @@ int main(int argc, char** argv) {
       }
     }
 
-    if (state.error_code != kNoError) {
+    // Installation has been aborted. Set the error code to kScriptExecutionFailure unless
-      fprintf(cmd_pipe, "log error: %d\n", state.error_code);
+    // a more specific code has been set in errmsg.
-      // Cause code should provide additional information about the abort;
+    if (state.error_code == kNoError) {
-      // report only when an error exists.
+      state.error_code = kScriptExecutionFailure;
-      if (state.cause_code != kNoCause) {
+    }
-        fprintf(cmd_pipe, "log cause: %d\n", state.cause_code);
+    fprintf(cmd_pipe, "log error: %d\n", state.error_code);
-      }
+    // Cause code should provide additional information about the abort.
+    if (state.cause_code != kNoCause) {
+      fprintf(cmd_pipe, "log cause: %d\n", state.cause_code);
     }
 
     if (updater_info.package_zip) {