summaryrefslogtreecommitdiffstats
path: root/install.c
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-09-17 22:02:48 +0200
committerDoug Zongker <dougz@android.com>2010-09-17 22:02:48 +0200
commitd7d4208976125d114d0b8e44438e2417d5275098 (patch)
tree1f5915af5ad0420295138e6d55dc95c094127d15 /install.c
parentdo not merge - update to match ext4utils api (diff)
downloadandroid_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar.gz
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar.bz2
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar.lz
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar.xz
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.tar.zst
android_bootable_recovery-d7d4208976125d114d0b8e44438e2417d5275098.zip
Diffstat (limited to '')
-rw-r--r--install.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/install.c b/install.c
index 2619a0cc0..a56dbd048 100644
--- a/install.c
+++ b/install.c
@@ -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);
}