Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6924eb7d authored by P.Adarsh Reddy's avatar P.Adarsh Reddy Committed by Yifan Hong
Browse files

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
parent 4d8e9cc8

tools/releasetools/edify_generator.py

+3 −3
Original line number Diff line number Diff line
@@ -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