diff options
| author | P.Adarsh Reddy <quic_padarshr@quicinc.com> | 2020-07-01 00:30:59 +0530 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2020-06-30 14:49:04 -0700 |
| commit | 6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af (patch) | |
| tree | 87289a23fd1d92cf75ac751ed639b5ac253b6365 | |
| parent | 4d8e9cc8475a20e6f577fa95168584aebfbfc5ad (diff) | |
| download | build_make-6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af.tar.gz build_make-6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af.tar.bz2 build_make-6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af.zip | |
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
| -rw-r--r-- | tools/releasetools/edify_generator.py | 6 |
1 files 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 |