diff options
author | Tao Bao <tbao@google.com> | 2015-09-03 18:14:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:14:42 +0000 |
commit | de4177d8158a741bf6f90a96d8c6fa1d24e48818 (patch) | |
tree | 1f903e4d48c451f8c55437e51ae99247d139cd3b | |
parent | 36890dac855b41cba77125337d6bbce1da33fd80 (diff) | |
parent | a6e6afbce69da968299898944bb2165f5e799886 (diff) | |
download | replicant_build-de4177d8158a741bf6f90a96d8c6fa1d24e48818.zip replicant_build-de4177d8158a741bf6f90a96d8c6fa1d24e48818.tar.gz replicant_build-de4177d8158a741bf6f90a96d8c6fa1d24e48818.tar.bz2 |
am a6e6afbc: am 39c322ce: releasetools: Fix the bug in symlink deletion.
* commit 'a6e6afbce69da968299898944bb2165f5e799886':
releasetools: Fix the bug in symlink deletion.
-rw-r--r-- | tools/releasetools/edify_generator.py | 11 | ||||
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 31 |
2 files changed, 38 insertions, 4 deletions
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 566e687..a52e328 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -243,6 +243,15 @@ class EdifyGenerator(object): cmd = "delete(" + ",\0".join(['"%s"' % (i,) for i in file_list]) + ");" self.script.append(self.WordWrap(cmd)) + def DeleteFilesIfNotMatching(self, file_list): + """Delete the file in file_list if not matching the checksum.""" + if not file_list: + return + for name, sha1 in file_list: + cmd = ('sha1_check(read_file("{name}"), "{sha1}") || ' + 'delete("{name}");'.format(name=name, sha1=sha1)) + self.script.append(self.WordWrap(cmd)) + def RenameFile(self, srcfile, tgtfile): """Moves a file from one location to another.""" if self.info.get("update_rename_support", False): @@ -254,7 +263,7 @@ class EdifyGenerator(object): """Prepend an action with an apply_patch_check in order to skip the action if the file exists. Used when a patch is later renamed.""" - cmd = ('sha1_check(read_file("%s"), %s) || ' % (tgtfile, tgtsha1)) + cmd = ('sha1_check(read_file("%s"), %s) ||' % (tgtfile, tgtsha1)) self.script.append(self.WordWrap(cmd)) def ApplyPatch(self, srcfile, tgtfile, tgtsize, tgtsha1, *patchpairs): diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 3a69675..25e3724 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1391,11 +1391,36 @@ else # Delete all the symlinks in source that aren't in target. This # needs to happen before verbatim files are unpacked, in case a # symlink in the source is replaced by a real file in the target. - to_delete = [] + + # If a symlink in the source will be replaced by a regular file, we cannot + # delete the symlink/file in case the package gets applied again. For such + # a symlink, we prepend a sha1_check() to detect if it has been updated. + # (Bug: 23646151) + replaced_symlinks = dict() + if system_diff: + for i in system_diff.verbatim_targets: + replaced_symlinks["/%s" % (i[0],)] = i[2] + if vendor_diff: + for i in vendor_diff.verbatim_targets: + replaced_symlinks["/%s" % (i[0],)] = i[2] + + if system_diff: + for tf in system_diff.renames.values(): + replaced_symlinks["/%s" % (tf.name,)] = tf.sha1 + if vendor_diff: + for tf in vendor_diff.renames.values(): + replaced_symlinks["/%s" % (tf.name,)] = tf.sha1 + + always_delete = [] + may_delete = [] for dest, link in source_symlinks: if link not in target_symlinks_d: - to_delete.append(link) - script.DeleteFiles(to_delete) + if link in replaced_symlinks: + may_delete.append((link, replaced_symlinks[link])) + else: + always_delete.append(link) + script.DeleteFiles(always_delete) + script.DeleteFilesIfNotMatching(may_delete) if system_diff.verbatim_targets: script.Print("Unpacking new system files...") |