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

Commit a9dff13d authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am:... 

Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29 am: 0d42f2f2 am: 3b47bc2b

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901

Change-Id: I698228e1860df3f659fbdb2e819d1cd58906fc1b
parents 2c311b05 3b47bc2b

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