← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_registration.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:
bzrlib/plugins/launchpad/lp_registration.py
86
86
 
87
87
    LAUNCHPAD_DOMAINS = {
88
88
        'production': 'launchpad.net',
89
 
        'edge': 'edge.launchpad.net',
90
89
        'staging': 'staging.launchpad.net',
91
90
        'demo': 'demo.launchpad.net',
92
91
        'dev': 'launchpad.dev',
98
97
    for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
99
98
        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
100
99
 
101
 
    # Previously 'edge' was used to avoid a launchpad bug with redirection
 
100
    # We use production as the default because edge has been deprecated circa
 
101
    # 2010-11 (see bug https://bugs.launchpad.net/bzr/+bug/583667)
102
102
    DEFAULT_INSTANCE = 'production'
103
103
    DEFAULT_SERVICE_URL = LAUNCHPAD_INSTANCE[DEFAULT_INSTANCE]
104
104