Merge lp:~maxb/udd/keep-temp into lp:udd

[Max Bowsher]

When learning about the function of the UDD import or debugging an import failure, it can be helpful for it to not delete its temporary working area when done. This branch adds a new option --keep-temp for this purpose.

[James Westby (james-w)]

Looks good.

I would recommend --no-push too, but it's clear that
--no-push isn't sufficient.

Thanks,

James

review: Approve

=== modified file 'import_package.py'
--- import_package.py	2010-10-03 01:42:50 +0000
+++ import_package.py	2010-10-03 17:36:43 +0000
@@ -46,6 +46,9 @@
 parser.add_option("--no-existing", dest="no_existing", action="store_true")
 parser.add_option("--extra-debian", dest="extra_debian")
 parser.add_option("--verbose", dest="verbose", action="store_true")
+parser.add_option("--keep-temp", dest="keep_temp", action="store_true",
+                  help="Do not delete the temporary directory at "
+                  "BASE_DIR/updates/PACKAGE_NAME when done")
 parser.add_option("-D", dest="debug_flags", action="append", default=[],
                   help="Set debug flags, see 'bzr help debug-flags'")
 parser.add_option("--lp-cache", dest="lp_cache", default=None,
@@ -901,7 +904,8 @@
     return filtered_versions
 
 
-def main(package, push=True, check=False, extra_debian=None, no_existing=False):
+def main(package, push=True, check=False, extra_debian=None, no_existing=False,
+        keep_temp=False):
     if not os.path.exists(icommon.logs_dir):
         os.makedirs(icommon.logs_dir)
     log_name = os.path.join(icommon.logs_dir, package)
@@ -962,7 +966,8 @@
                 icommon.possibly_generate_ubuntu_merges(lp, temp_dir, package,
                         bstore, possible_transports=possible_transports)
                 print "Nothing new"
-                shutil.rmtree(temp_dir)
+                if not keep_temp:
+                    shutil.rmtree(temp_dir)
                 return 0
             # First grab all the branches locally
             create_update_branches(package, versions, temp_dir, bstore,
@@ -977,7 +982,7 @@
                 import_package(temp_dir, importp, revid_db, bstore, possible_transports=possible_transports)
             revid_db.commit_outstanding()
         except:
-            if push:
+            if push and not keep_temp:
                 shutil.rmtree(temp_dir)
             raise
         if check:
@@ -990,7 +995,8 @@
                     possible_transports=possible_transports)
             icommon.generate_ubuntu_merges(lp, temp_dir, package, bstore,
                     possible_transports=possible_transports)
-            shutil.rmtree(temp_dir)
+            if not keep_temp:
+                shutil.rmtree(temp_dir)
             revid_db.commit()
         mutter("Imported %s" % str(versions))
         print "Imported %s" % str(versions)
@@ -1044,7 +1050,8 @@
         try:
             sys.exit(main(args[0], push=not options.no_push,
                         extra_debian=options.extra_debian, check=options.check,
-                        no_existing=options.no_existing))
+                        no_existing=options.no_existing,
+                        keep_temp=options.keep_temp))
         except HTTPError, e:
             print e.content.decode("utf-8", "replace")
             raise