From 6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af Mon Sep 17 00:00:00 2001 From: "P.Adarsh Reddy" Date: Wed, 1 Jul 2020 00:30:59 +0530 Subject: [PATCH] Fix up _CheckSecondTokenNotSlotSuffixed function. Incremental OTA generation was failing since the function _CheckSecondTokenNotSlotSuffixed was in broken state, this change fixes the same. Bug: 160215626 Test: Incremental OTA now gets generated and applied successfully a non-ab device. Change-Id: Ifb3886396fe65dcdaeba16c568419b9fa084193d (cherry picked from commit 52defe48d52a770c326f489357ab8877b211541e) Merged-In: Ifb3886396fe65dcdaeba16c568419b9fa084193d --- tools/releasetools/edify_generator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 99e21f1c04..b9c9b197b3 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -374,12 +374,12 @@ class EdifyGenerator(object): def _CheckSecondTokenNotSlotSuffixed(self, s, fn): lst = s.split(':') - assert(len(s) == 4), "{} does not contain 4 tokens".format(s) + assert(len(lst) == 4), "{} does not contain 4 tokens".format(s) if self.fstab: - entry = common.GetEntryForDevice(s[1]) + entry = common.GetEntryForDevice(self.fstab, lst[1]) if entry is not None: assert not entry.slotselect, \ - "Use %s because %s is slot suffixed" % (fn, s[1]) + "Use %s because %s is slot suffixed" % (fn, lst[1]) def WriteRawImage(self, mount_point, fn, mapfn=None): """Write the given package file into the partition for the given