commit 17c6e3b3f95d382addec6897eea19afc348c5c02
author Rupert Swarbrick <rswarbrick@lowrisc.org> Tue Apr 28 15:17:32 2020 +0100
committer Philipp Wagner <mail@philipp-wagner.com> Tue May 26 11:29:52 2020 +0100
tree eb8da5bd7a03a5bf674ad5e19f850f0ca3f4578e
parent 643e7c011503fc586b810d9a7f5d90a42b54a9a5

[util] Use TemporaryDirectory rather than mkdtemp in vendor.py

This has the same behaviour as the explicit try/finally, but is
probably simpler to understand (especially in the second case where
there is a lot of code between the try and the finally).

Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>

util/vendor.py

diff --git a/util/vendor.py b/util/vendor.py
index 962a589..a555c2a 100755
--- a/util/vendor.py
+++ b/util/vendor.py
@@ -297,8 +297,7 @@
 
 def _export_patches(patchrepo_clone_url, target_patch_dir, upstream_rev,
                     patched_rev):
-    clone_dir = Path(tempfile.mkdtemp())
-    try:
+    with tempfile.TemporaryDirectory() as clone_dir:
         clone_git_repo(patchrepo_clone_url, clone_dir, patched_rev)
         rev_range = 'origin/' + upstream_rev + '..' + 'origin/' + patched_rev
         cmd = ['git', 'format-patch', '-o', str(target_patch_dir), rev_range]
@@ -306,9 +305,6 @@
             cmd += ['-q']
         subprocess.run(cmd, cwd=str(clone_dir), check=True)
 
-    finally:
-        shutil.rmtree(str(clone_dir), ignore_errors=True)
-
 
 def import_from_upstream(upstream_path, target_path, exclude_files=[]):
     log.info('Copying upstream sources to %s', target_path)
@@ -482,8 +478,7 @@
     if args.refresh_patches:
         refresh_patches(desc)
 
-    clone_dir = Path(tempfile.mkdtemp())
-    try:
+    with tempfile.TemporaryDirectory() as clone_dir:
         # clone upstream repository
         upstream_new_rev = clone_git_repo(desc.upstream.url, clone_dir, rev=desc.upstream.rev)
 
@@ -582,9 +577,6 @@
 
             git_add_commit(commit_paths, commit_msg)
 
-    finally:
-        shutil.rmtree(str(clone_dir), ignore_errors=True)
-
     log.info('Import finished')