Launchpad itself

Merge lp:~james-w/launchpad/bug-524302 into lp:launchpad/db-devel

  1. bug-524302
  2. Merge into db-devel
Proposed by James Westby on 2010-04-08
Status: Merged
Approved by: Michael Nelson on 2010-04-08
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~james-w/launchpad/bug-524302
Merge into: lp:launchpad/db-devel
Diff against target: 12 lines (+1/-1)
1 file modified
lib/lp/registry/browser/productseries.py (+1/-1)
To merge this branch: bzr merge lp:~james-w/launchpad/bug-524302
Reviewer Review Type Date Requested Status
Michael Nelson (community) code 2010-04-08 Approve on 2010-04-08
Review via email: mp+23006@code.launchpad.net

Commit Message

ProductSeries +set-branch page doesn't use ProductSeriesBranchTarget for code imports.

Description of the Change

Hi,

This fixes the current buildbot failure in db-devel.

Instead of trying to use the ProductSeriesBranchTarget
as the code import target then it uses ProductBranchTarget.
Tim says that the former shouldn't really exist anyway.

Thanks,

James

To post a comment you must log in.
Michael Nelson (michael.nelson) wrote :

Thanks James.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/browser/productseries.py'
2--- lib/lp/registry/browser/productseries.py 2010-04-07 13:20:12 +0000
3+++ lib/lp/registry/browser/productseries.py 2010-04-08 10:11:29 +0000
4@@ -975,7 +975,7 @@
5 rcs_item = RevisionControlSystems.items[rcs_type.name]
6 code_import = getUtility(ICodeImportSet).new(
7 registrant=branch_owner,
8- target=self.target,
9+ target=IBranchTarget(self.context.product),
10 branch_name=branch_name,
11 rcs_type=rcs_item,
12 url=url,

Subscribers

People subscribed via source and target branches

to status/vote changes: