From db8dedf12f9aabce1a95c715af6da9aeeae7155f Mon Sep 17 00:00:00 2001 From: Chris Soyars Date: Fri, 26 Feb 2010 02:48:08 -0500 Subject: [PATCH] Fixed a bug that would never allow update_package + wipe_data to be called. --- recovery.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recovery.c b/recovery.c index 1f2c83f..7759568 100644 --- a/recovery.c +++ b/recovery.c @@ -518,12 +518,6 @@ main(int argc, char **argv) if (wipe_data && erase_root("DATA:")) status = INSTALL_ERROR; status = install_package(update_package); if (status != INSTALL_SUCCESS) ui_print("Installation aborted.\n"); - } else if (update_package != NULL && wipe_data) { - if (device_wipe_data()) status = INSTALL_ERROR; - if (erase_root("DATA:")) status = INSTALL_ERROR; - if (wipe_cache && erase_root("CACHE:")) status = INSTALL_ERROR; - status = install_package(update_package); - if (status != INSTALL_SUCCESS) ui_print("Installation aborted.\n"); } else if (wipe_data) { if (device_wipe_data()) status = INSTALL_ERROR; if (erase_root("DATA:")) status = INSTALL_ERROR;