diff options
| author | Tao Bao <tbao@google.com> | 2015-03-22 14:20:48 -0700 |
|---|---|---|
| committer | Chris Elliott <chriselliott@google.com> | 2015-07-02 13:17:21 -0700 |
| commit | 4dacce92ce151cebe97f15ccb9772c0d78d8610d (patch) | |
| tree | 815d256b037b3992eaf5b24348daea13471b035d /tools | |
| parent | 7f9470cda390ee61c0fc71491d0c649fbf6e02dd (diff) | |
| download | build-4dacce92ce151cebe97f15ccb9772c0d78d8610d.zip build-4dacce92ce151cebe97f15ccb9772c0d78d8610d.tar.gz build-4dacce92ce151cebe97f15ccb9772c0d78d8610d.tar.bz2 | |
DO NOT MERGE Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.
Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/releasetools/edify_generator.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index e52c264..934d751 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): |