Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dacce92 authored by Tao Bao's avatar Tao Bao Committed by Chris Elliott
Browse files

DO NOT MERGE Fix the syntax error in the edify script generator 

file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
parent 7f9470cd

tools/releasetools/edify_generator.py

+5 −5
Original line number Original line Diff line number Diff line
@@ -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):