diff options
author | Doug Zongker <dougz@android.com> | 2010-09-17 22:30:15 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 22:30:15 +0200 |
commit | 40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616 (patch) | |
tree | 1f5915af5ad0420295138e6d55dc95c094127d15 /install.c | |
parent | am 792b0071: do not merge - update to match ext4utils api (diff) | |
parent | remove unneeded partition roots (diff) | |
download | android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar.gz android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar.bz2 android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar.lz android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar.xz android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.tar.zst android_bootable_recovery-40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616.zip |
Diffstat (limited to '')
-rw-r--r-- | install.c | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -159,17 +159,6 @@ try_update_binary(const char *path, ZipArchive *zip) { return INSTALL_SUCCESS; } -static int -handle_update_package(const char *path, ZipArchive *zip) -{ - // Update should take the rest of the progress bar. - ui_print("Installing update...\n"); - - int result = try_update_binary(path, zip); - register_package_root(NULL, NULL); // Unregister package root - return result; -} - // Reads a file containing one or more public keys as produced by // DumpPublicKey: this is an RSAPublicKey struct as it would appear // as a C source literal, eg: @@ -300,6 +289,6 @@ install_package(const char *root_path) /* Verify and install the contents of the package. */ - int status = handle_update_package(path, &zip); - return status; + ui_print("Installing update...\n"); + return try_update_binary(path, &zip); } |