summaryrefslogtreecommitdiffstats
path: root/tools/releasetools
diff options
context:
space:
mode:
authorChris Elliott <chriselliott@google.com>2015-07-02 20:18:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-02 20:18:35 +0000
commit1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d (patch)
tree71b0a472f1dc1005fe4c3866c66e3ba032633013 /tools/releasetools
parent1aa1af0e997699bc025e4f0a754692068328d7e6 (diff)
parent4dacce92ce151cebe97f15ccb9772c0d78d8610d (diff)
downloadbuild-1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d.zip
build-1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d.tar.gz
build-1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d.tar.bz2
Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
Diffstat (limited to 'tools/releasetools')
-rw-r--r--tools/releasetools/edify_generator.py10
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):