launchpad-reviewers team mailing list archive

[Jelmer Vernooij <jelmer@xxxxxxxxx>]

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/auto-upgrade-qafix into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/auto-upgrade-qafix/+merge/64771

This is a QA fix after lp:~jelmer/launchpad/auto-upgrade.

Remove the backup directory after upgrading a bzr import branch. 

Leaving the backup directory around interferes with CSCVS (http://staging.launchpadlibrarian.net/73288606/vcs-imports-pydoctor-trunk.log).
-- 
https://code.launchpad.net/~jelmer/launchpad/auto-upgrade-qafix/+merge/64771
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/auto-upgrade-qafix into lp:launchpad.

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2011-06-13 12:32:47 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2011-06-16 00:14:36 +0000
@@ -215,6 +215,7 @@
         # The fetched branch is in the default format.
         new_branch = store.pull(
             self.arbitrary_branch_id, self.temp_dir, default_format)
+        self.assertEquals(os.listdir(self.temp_dir), [".bzr"])
         self.assertEqual(
             default_format, new_branch.bzrdir._format)
 

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2011-06-14 08:25:41 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2011-06-16 00:14:36 +0000
@@ -113,7 +113,7 @@
                 local_bzr_dir.root_transport.delete_tree('backup.bzr')
             except NoSuchFile:
                 pass
-            upgrade(target_path, required_format)
+            upgrade(target_path, required_format, clean_up=True)
         if needs_tree:
             local_bzr_dir.create_workingtree()
         return local_bzr_dir.open_branch()