StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yifan Hong
2020-07-01 01:38:10 +00:00
committed by Android (Google) Code Review
parent d1198b74b5 6924eb7d40
commit 2206bb29fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/edify_generator.py
View File

@@ -374,12 +374,12 @@ class EdifyGenerator(object):
def _CheckSecondTokenNotSlotSuffixed(self, s, fn): def _CheckSecondTokenNotSlotSuffixed(self, s, fn):
lst = s.split(':') 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: if self.fstab:
entry = common.GetEntryForDevice(s[1]) entry = common.GetEntryForDevice(self.fstab, lst[1])
if entry is not None: if entry is not None:
assert not entry.slotselect, \ 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): def WriteRawImage(self, mount_point, fn, mapfn=None):
"""Write the given package file into the partition for the given """Write the given package file into the partition for the given