diff options
| author | Tianjie Xu <xunchang@google.com> | 2016-03-08 08:47:05 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-08 08:47:05 +0100 |
| commit | 6289e79532b6b03c39b0980eeb7a6892371ca328 (patch) | |
| tree | e9e4968b3c585846d32157cf3dcdbdb866037497 /install.cpp | |
| parent | Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b (diff) | |
| parent | Merge "Reboot and retry on I/O errors" am: 94dc34148c (diff) | |
| download | android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar.gz android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar.bz2 android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar.lz android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar.xz android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.tar.zst android_bootable_recovery-6289e79532b6b03c39b0980eeb7a6892371ca328.zip | |
Diffstat (limited to 'install.cpp')
| -rw-r--r-- | install.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/install.cpp b/install.cpp index 33c1f5498..144a353d6 100644 --- a/install.cpp +++ b/install.cpp @@ -144,6 +144,7 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { close(pipefd[1]); *wipe_cache = false; + bool retry_update = false; char buffer[1024]; FILE* from_child = fdopen(pipefd[0], "r"); @@ -180,6 +181,8 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { // to be able to reboot during installation (useful for // debugging packages that don't exit). ui->SetEnableReboot(true); + } else if (strcmp(command, "retry_update") == 0) { + retry_update = true; } else { LOGE("unknown command [%s]\n", command); } @@ -188,6 +191,9 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { int status; waitpid(pid, &status, 0); + if (retry_update) { + return INSTALL_RETRY; + } if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { LOGE("Error in %s\n(Status %d)\n", path, WEXITSTATUS(status)); return INSTALL_ERROR; |