[gentoo-commits] proj/qa-scripts:master commit in: /

[Robin H. Johnson]

commit:     dacd3b42154210e1d50fbe947a9bf9a7136d3081
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 06:38:58 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 06:38:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=dacd3b42

genrdeps-index: safely create/overwrite rdeps tarball

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 genrdeps-index.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/genrdeps-index.py b/genrdeps-index.py
index 1f0b24c..feea62c 100755
--- a/genrdeps-index.py
+++ b/genrdeps-index.py
@@ -11,6 +11,7 @@ import os.path
 import shutil
 import subprocess
 import sys
+import tempfile
 
 import pkgcore.config
 from pkgcore.ebuild.atom import atom
@@ -102,12 +103,24 @@ def main():
         os.rename(newdir, outdir)
         shutil.rmtree(olddir, onerror=rmtree_ignore_enoent)
 
-    subprocess.check_call(
-        ['tar', '-cf', 'rdeps.tar'] + [gi for g, gi in GROUPS],
-        cwd=args.outputdir)
-    subprocess.check_call(
-        ['xz', '-9', 'rdeps.tar'],
-        cwd=args.outputdir)
+    with tempfile.NamedTemporaryFile(prefix='.tmp.rdeps-', suffix='.tar', 
dir=args.outputdir, delete=False) as tmpf:
+        try:
+            subprocess.check_call(
+                ['tar', '-cf', tmpf.name] + [gi for g, gi in GROUPS],
+                cwd=args.outputdir)
+            subprocess.check_call(
+                ['xz', '-9', tmpf.name],
+                cwd=args.outputdir)
+            os.rename(tmpf.name + '.xz', os.path.join(args.outputdir, 
'rdeps.tar.xz'))
+        except Exception as e:
+            raise e
+        finally:
+            # Cleanup:
+            for f in [tmpf.name, (tmpf.name + '.xz')]:
+                try:
+                    os.unlink(f)
+                except FileNotFoundError as e:
+                    pass
 
     return 0