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

Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev

Browse Source
This commit is contained in:
Chris Elliott
2015-07-02 20:18:34 +00:00
committed by Android (Google) Code Review
parent 1aa1af0e99 4dacce92ce
commit 1e253e76b9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/edify_generator.py
View File

@@ -74,11 +74,11 @@ class EdifyGenerator(object):
raise ValueError("must specify an OEM property") raise ValueError("must specify an OEM property")
if not value: if not value:
raise ValueError("must specify the OEM value") raise ValueError("must specify the OEM value")
cmd = ('file_getprop("/oem/oem.prop", "%s") == "%s" || ' cmd = ('file_getprop("/oem/oem.prop", "{name}") == "{value}" || '
'abort("This package expects the value \\"%s\\" for ' 'abort("This package expects the value \\"{value}\\" for '
'\\"%s\\" on the OEM partition; ' '\\"{name}\\" on the OEM partition; this has value \\"" + '
'this has value \\"" + file_getprop("/oem/oem.prop") + "\\".");' 'file_getprop("/oem/oem.prop", "{name}") + "\\".");'
) % (name, value, name, value) ).format(name=name, value=value)
self.script.append(cmd) self.script.append(cmd)
def AssertSomeFingerprint(self, *fp): def AssertSomeFingerprint(self, *fp):