commit | 270ebd7f68db05d2fcc6d7ce5623698c17749b97 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 26 06:42:40 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 26 06:42:40 2022 +0000 |
tree | cfa04570328dcca362bc432b555b39272c7c38d8 | |
parent | b18751018a895ec7e0c9f988ef3f019ed844ee6a [diff] | |
parent | 4d083132f93f3cfb64aa6c4dcfd03aad2dbf95f3 [diff] |
Merge "Ignore cleanup errors." am: afe0e76c28 am: 4d083132f9 Original change: https://android-review.googlesource.com/c/platform/build/+/2000465 Change-Id: Ib2b3cd2058a775f8de92d5a0ab6ffedab9926eba
diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py index 69d6c13..3f13a4a 100644 --- a/tools/releasetools/apex_utils.py +++ b/tools/releasetools/apex_utils.py
@@ -214,7 +214,7 @@ if os.path.isfile(path): os.remove(path) elif os.path.isdir(path): - shutil.rmtree(path) + shutil.rmtree(path, ignore_errors=True) # TODO(xunchang) the signing process can be improved by using # '--unsigned_payload_only'. But we need to parse the vbmeta earlier for