From fb8886db6858388af5082268fd023b8a44fb87ea Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Thu, 23 Oct 2014 13:51:04 -0700 Subject: [PATCH] get_stage in updater takes one param, not two. Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150 --- tools/releasetools/ota_from_target_files | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 2a3ab89fd..5cf9873e8 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -528,13 +528,13 @@ def WriteFullOTAPackage(input_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") == "3/3" then +else if get_stage("%(bcb_dev)s") == "3/3" then """ % bcb_dev) device_specific.FullOTA_InstallBegin() @@ -789,14 +789,14 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.AppendExtra("sleep(20);\n"); script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") != "3/3" then +else if get_stage("%(bcb_dev)s") != "3/3" then """ % bcb_dev) script.Print("Verifying current system...") @@ -1138,14 +1138,14 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.AppendExtra("sleep(20);\n"); script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") != "3/3" then +else if get_stage("%(bcb_dev)s") != "3/3" then """ % bcb_dev) script.Print("Verifying current system...") -- 2.11.0