commit | 4d083132f93f3cfb64aa6c4dcfd03aad2dbf95f3 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 26 06:20:17 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 26 06:20:17 2022 +0000 |
tree | e5cdb285042e75434d2f29af1279667537cc01a5 | |
parent | beb515cfec26ec2defbc5c4cae86ff225d1605d7 [diff] | |
parent | afe0e76c28aa389a1ce5fd3f3ab113fc44431482 [diff] |
Merge "Ignore cleanup errors." am: afe0e76c28 Original change: https://android-review.googlesource.com/c/platform/build/+/2000465 Change-Id: I455774c1e67b2d22eb21b5f9b2ce7076cbfb2bb2
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