diff options
author | Tao Bao <tbao@google.com> | 2015-09-04 17:05:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-04 17:05:55 +0000 |
commit | 8f4b307e56ea73153f249b44dc2b15de77e058f7 (patch) | |
tree | 1463218521f5013012269d990327d340e533430a | |
parent | 4379e2b8bbaf2a02777f189c758e251015eb7f76 (diff) | |
parent | a77d41e2f7021d11e8bcb863f3e331d5d92ba6a1 (diff) | |
download | build-8f4b307e56ea73153f249b44dc2b15de77e058f7.tar.gz |
Merge "releasetools: Fix the bug when deleting files."
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 7a11ba664b..d686004a96 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1072,11 +1072,13 @@ class FileDifference(object): script.FileCheck(tf.name, tf.sha1) def RemoveUnneededFiles(self, script, extras=()): - script.DeleteFiles( - ["/" + i[0] for i in self.verbatim_targets] + - ["/" + i for i in sorted(self.source_data) - if i not in self.target_data and i not in self.renames] + - list(extras)) + file_list = ["/" + i[0] for i in self.verbatim_targets] + file_list += ["/" + i for i in self.source_data + if i not in self.target_data and i not in self.renames] + file_list += list(extras) + # Sort the list in descending order, which removes all the files first + # before attempting to remove the folder. (Bug: 22960996) + script.DeleteFiles(sorted(file_list, reverse=True)) def TotalPatchSize(self): return sum(i[1].size for i in self.patch_list) |