Merge lp:~sil2100/ubuntu-archive-tools/kernel-sru-cleanup into lp:ubuntu-archive-tools

[Łukasz Zemczak]

Download the kernel sources to temporary directories in kernel-sru-review, cleanup when done. Allow for bypassing the cleanup mechanism.

Download the kernel sources to temporary directories in kernel-sru-review, cleanup when done. Allow for bypassing the cleanup mechanism.

=== modified file 'kernel-sru-review'
--- kernel-sru-review	2017-01-19 13:45:58 +0000
+++ kernel-sru-review	2017-03-17 19:39:13 +0000
@@ -32,9 +32,12 @@
 import os
 import pytz
 import re
+import shutil
 import subprocess
 import sys
 import time
+from contextlib import ExitStack
+from tempfile import mkdtemp
 from optparse import OptionParser
 
 from launchpadlib.launchpad import Launchpad
@@ -185,6 +188,8 @@
 
     parser.add_option(
         "-l", "--launchpad", dest="launchpad_instance", default="production")
+    parser.add_option(
+        "-k", "--keep-files", dest="keep_files", action="store_true")
 
     opts, bugs = parser.parse_args()
 
@@ -200,8 +205,14 @@
                 distribution=ubuntu, name='ppa')
 
     context = {'archive': archive, 'ppa': ppa, 'ubuntu': ubuntu}
+    main_dir = os.getcwd()
     for bugnum in bugs:
-        process_sru_bug(
-            launchpad, bugnum, review_task_callback, review_source_callback,
-            context)
-    # XXX: clean up temp files
+        with ExitStack() as resources:
+            cwd = mkdtemp(prefix='kernel-sru-{}-'.format(bugnum), dir=main_dir)
+            if not opts.keep_files:
+                resources.callback(shutil.rmtree, cwd)
+            os.chdir(cwd)
+            process_sru_bug(
+                launchpad, bugnum, review_task_callback,
+                review_source_callback, context)
+            os.chdir(main_dir)