diff options
| author | Yifan Hong <elsk@google.com> | 2020-07-01 01:38:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-01 01:38:10 +0000 |
| commit | 2206bb29fdc5f863c651840a3ce3e47167d1d534 (patch) | |
| tree | 099dd899c88124d513fbc987f8c32685776ea585 | |
| parent | d1198b74b5cf2d1fa23b0940d7dde41afa87af05 (diff) | |
| parent | 6924eb7d405a6dee31ae6c6c2bcc9fd371fc97af (diff) | |
| download | build_make-2206bb29fdc5f863c651840a3ce3e47167d1d534.tar.gz build_make-2206bb29fdc5f863c651840a3ce3e47167d1d534.tar.bz2 build_make-2206bb29fdc5f863c651840a3ce3e47167d1d534.zip | |
Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev
| -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 |