aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2015-03-26 16:32:34 -0700
committereyosen <abittin@gmail.com>2015-03-29 21:03:16 +0300
commit783bd6f2ef0ecef814b9d80e3befc28d28db9af3 (patch)
tree8eafcf04a4e414922459f650d33fcbe63b623480
parentbece46388a84f66aa1a80c7b8291212d9c17592d (diff)
ota_from_target_files: Fix path for SkipNextActionIfTargetExistslp5.0
Without the leading forward slash, the check always fails. Change-Id: I57320c20ca2b384713182082b1ad5321d78dbb2b
-rwxr-xr-xtools/releasetools/ota_from_target_files4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
index 94571017fc..6bd27c2c6b 100755
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -1111,7 +1111,7 @@ class FileDifference:
so_far = 0
for tf, sf, size, patch_sha 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
@@ -1141,7 +1141,7 @@ class FileDifference:
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
script.SetProgress(so_far / total_patch_size)