Launchpad itself

Merge lp:~thumper/launchpad/stop-factory-mirroring into lp:launchpad

  1. stop-factory-mirroring
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: 11242
Proposed branch: lp:~thumper/launchpad/stop-factory-mirroring
Merge into: lp:launchpad
Prerequisite: lp:~thumper/launchpad/fix-mirror-failure-story
Diff against target: 13 lines (+2/-1)
1 file modified
lib/lp/testing/factory.py (+2/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/stop-factory-mirroring
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+31011@code.launchpad.net

Commit message

The LaunchpadObjectFactory shouldn't call startMirroring on a hosted branch.

Description of the change

Part of my pre-work for making startMirror, requestMirror and mirrorComplete blow up with hosted branches.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2010-07-26 06:21:45 +0000
+++ lib/lp/testing/factory.py 2010-07-27 03:27:49 +0000
@@ -1121,7 +1121,8 @@
1121 branch.createBranchRevision(sequence, revision)1121 branch.createBranchRevision(sequence, revision)
1122 parent = revision1122 parent = revision
1123 parent_ids = [parent.revision_id]1123 parent_ids = [parent.revision_id]
1124 branch.startMirroring()1124 if branch.branch_type not in (BranchType.REMOTE, BranchType.HOSTED):
1125 branch.startMirroring()
1125 removeSecurityProxy(branch).branchChanged(1126 removeSecurityProxy(branch).branchChanged(
1126 '', parent.revision_id, None, None, None)1127 '', parent.revision_id, None, None, None)
1127 branch.updateScannedDetails(parent, sequence)1128 branch.updateScannedDetails(parent, sequence)