~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-02 14:58:47 UTC
  • mfrom: (5554.1.3 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101202145847-fw822sd3nyhvrwmi
(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
        #681885 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
        if staging:
75
75
            lp_instance = 'staging'
76
76
        else:
77
 
            lp_instance = 'edge'
 
77
            lp_instance = 'production'
78
78
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
79
79
        self.launchpad = lp_api.login(service)
80
80
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(