DO NOT MERGE Fix the syntax error in the edify script generator

file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
This commit is contained in:
Tao Bao 2015-03-22 14:20:48 -07:00 committed by Chris Elliott
parent 7f9470cda3
commit 4dacce92ce
1 changed files with 5 additions and 5 deletions

View File

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