launchpad-reviewers team mailing list archive

[Jonathan Lange <jml@xxxxxxxxx>]

Jonathan Lange has proposed merging lp:~jml/launchpad/fix-branch-distro-prod into lp:~launchpad-pqm/launchpad/production-devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


This branch fixes a critical bug in the branch-distro script which would prevent the newly created branches from being downloadable due to incorrect stacking information.

We need to create the branches today as part of the natty new release process (https://wiki.ubuntu.com/NewReleaseCycleProcess), hence the cherry pick.
-- 
https://code.launchpad.net/~jml/launchpad/fix-branch-distro-prod/+merge/38105
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jml/launchpad/fix-branch-distro-prod into lp:~launchpad-pqm/launchpad/production-devel.

=== modified file 'lib/lp/codehosting/branchdistro.py'
--- lib/lp/codehosting/branchdistro.py	2010-09-21 05:14:18 +0000
+++ lib/lp/codehosting/branchdistro.py	2010-10-11 10:29:41 +0000
@@ -371,5 +371,6 @@
             old_db_branch.control_format,
             old_db_branch.branch_format,
             old_db_branch.repository_format)
+        old_db_branch.stacked_on = new_db_branch
         transaction.commit()
         return new_db_branch

=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2010-09-21 05:21:05 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-10-11 10:29:41 +0000
@@ -274,6 +274,8 @@
         self.assertEqual(old_ancestry, new_ancestry)
         self.assertEqual(old_history, new_history)
         self.assertFalse(new_branch.pending_writes)
+        self.assertIs(None, new_branch.stacked_on)
+        self.assertEqual(new_branch, db_branch.stacked_on)
         # The script doesn't have permission to create branch jobs, but just
         # to be insanely paradoid.
         transaction.commit()