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

Commit c386890d authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Abort the update on apply_patch failures. 

We used to silently ignore the return value from apply_patch() even if
it had failed. It gives us more trouble to investigate the failure when
the affected file/partition gets touched in subsequent OTAs. This CL
adds the checking of the return value and aborts the update accordingly.

Bug: 25893277
Change-Id: Ie5e1c563576e503343e6a5b28ed4d7039f6f919c
parent b98fa197

tools/releasetools/edify_generator.py

+2 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ class EdifyGenerator(object): 
    cmd = ['apply_patch("%s",\0"%s",\0%s,\0%d'

           % (srcfile, tgtfile, tgtsha1, tgtsize)]

    for i in range(0, len(patchpairs), 2):

      cmd.append(',\0%s, package_extract_file("%s")' % patchpairs[i:i+2])

    cmd.append(');')

      cmd.append(',\0%s,\0package_extract_file("%s")' % patchpairs[i:i+2])

    cmd.append(') ||\n    abort("Failed to apply patch to %s");' % (srcfile,))

    cmd = "".join(cmd)

    self.script.append(self.WordWrap(cmd))