From 4dacce92ce151cebe97f15ccb9772c0d78d8610d Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Sun, 22 Mar 2015 14:20:48 -0700 Subject: [PATCH] DO NOT MERGE Fix the syntax error in the edify script generator file_getprop() always expects two arguments. Bug: 19881931 Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c --- tools/releasetools/edify_generator.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index e52c264156..934d751f48 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -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):