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

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

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