summaryrefslogtreecommitdiffstats
path: root/updater/updater.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-05-03 19:34:43 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-05-03 19:34:45 +0200
commit89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15 (patch)
treefa4fca46de414eb53dadacaa629571762147654f /updater/updater.cpp
parentMerge "Move sysMapFile and sysReleaseMap into MemMapping class." (diff)
parentAdd a default error code when updater script aborts (diff)
downloadandroid_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar.gz
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar.bz2
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar.lz
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar.xz
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.tar.zst
android_bootable_recovery-89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15.zip
Diffstat (limited to 'updater/updater.cpp')
-rw-r--r--updater/updater.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 749c86a1f..1be8b6040 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -193,13 +193,15 @@ int main(int argc, char** argv) {
}
}
- if (state.error_code != kNoError) {
- fprintf(cmd_pipe, "log error: %d\n", state.error_code);
- // Cause code should provide additional information about the abort;
- // report only when an error exists.
- if (state.cause_code != kNoCause) {
- fprintf(cmd_pipe, "log cause: %d\n", state.cause_code);
- }
+ // Installation has been aborted. Set the error code to kScriptExecutionFailure unless
+ // a more specific code has been set in errmsg.
+ if (state.error_code == kNoError) {
+ state.error_code = kScriptExecutionFailure;
+ }
+ 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) {