Fixed a bug that would never allow update_package + wipe_data to be called.

This commit is contained in:
Chris Soyars 2010-02-26 02:48:08 -05:00
parent 185baeeb79
commit db8dedf12f

View File

@ -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;