am b5901670: Merge "Fix the syntax error in the edify script generator"

* commit 'b59016703a540a541a94e352c1ef54442a0e95dd':
  Fix the syntax error in the edify script generator
This commit is contained in:
Tao Bao 2015-03-23 03:35:56 +00:00 committed by Android Git Automerger
commit 62eed4d8a9

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):