Loading tools/releasetools/ota_from_target_files.py +7 −5 Original line number Original line Diff line number Diff line Loading @@ -1072,11 +1072,13 @@ class FileDifference(object): script.FileCheck(tf.name, tf.sha1) script.FileCheck(tf.name, tf.sha1) def RemoveUnneededFiles(self, script, extras=()): def RemoveUnneededFiles(self, script, extras=()): script.DeleteFiles( file_list = ["/" + i[0] for i in self.verbatim_targets] ["/" + i[0] for i in self.verbatim_targets] + file_list += ["/" + i for i in self.source_data ["/" + i for i in sorted(self.source_data) if i not in self.target_data and i not in self.renames] if i not in self.target_data and i not in self.renames] + file_list += list(extras) 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): def TotalPatchSize(self): return sum(i[1].size for i in self.patch_list) return sum(i[1].size for i in self.patch_list) Loading Loading
tools/releasetools/ota_from_target_files.py +7 −5 Original line number Original line Diff line number Diff line Loading @@ -1072,11 +1072,13 @@ class FileDifference(object): script.FileCheck(tf.name, tf.sha1) script.FileCheck(tf.name, tf.sha1) def RemoveUnneededFiles(self, script, extras=()): def RemoveUnneededFiles(self, script, extras=()): script.DeleteFiles( file_list = ["/" + i[0] for i in self.verbatim_targets] ["/" + i[0] for i in self.verbatim_targets] + file_list += ["/" + i for i in self.source_data ["/" + i for i in sorted(self.source_data) if i not in self.target_data and i not in self.renames] if i not in self.target_data and i not in self.renames] + file_list += list(extras) 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): def TotalPatchSize(self): return sum(i[1].size for i in self.patch_list) return sum(i[1].size for i in self.patch_list) Loading