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

Unverified Commit 90027907 authored by Brint E. Kriebel's avatar Brint E. Kriebel Committed by Michael Bestas
Browse files

ota_from_target_files: Fix path for SkipNextActionIfTargetExists 

Without the leading forward slash, the check always fails.

Change-Id: I57320c20ca2b384713182082b1ad5321d78dbb2b
parent ac34b8cf

tools/releasetools/ota_from_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ class FileDifference(object): 
    so_far = 0

    for tf, sf, _, _ in self.patch_list:

      if tf.name != sf.name:

        script.SkipNextActionIfTargetExists(tf.name, tf.sha1)

        script.SkipNextActionIfTargetExists("/" + tf.name, tf.sha1)

      script.PatchCheck("/"+sf.name, tf.sha1, sf.sha1)

      so_far += sf.size

    return so_far
@@ -1470,7 +1470,7 @@ class FileDifference(object): 
        deferred_patch_list.append(item)

        continue

      if sf.name != tf.name:

        script.SkipNextActionIfTargetExists(tf.name, tf.sha1)

        script.SkipNextActionIfTargetExists("/" + tf.name, tf.sha1)

      script.ApplyPatch("/" + sf.name, "-", tf.size, tf.sha1, sf.sha1,

                        "patch/" + sf.name + ".p")

      so_far += tf.size