/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2019-02-03 23:43:20 UTC
  • mfrom: (7267 work)
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190203234320-zbquyl9973hbujnb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/launchpad/lp_propose.py
30
30
from breezy.i18n import gettext
31
31
from breezy.plugins.launchpad import (
32
32
    lp_api,
33
 
    lp_registration,
34
33
    )
35
34
""")
36
35
 
69
68
        """
70
69
        self.tree = tree
71
70
        if staging:
72
 
            lp_instance = 'staging'
 
71
            lp_base_url = lp_api.uris.STAGING_SERVICE_ROOT
73
72
        else:
74
 
            lp_instance = 'production'
75
 
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
76
 
        self.launchpad = lp_api.login(service)
 
73
            lp_base_url = lp_api.uris.LPNET_SERVICE_ROOT
 
74
        self.launchpad = lp_api.connect_launchpad(lp_base_url)
77
75
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
78
76
            self.launchpad, source_branch)
79
77
        if target_branch is None: