← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Alexander Belchenko
  • Date: 2008-02-16 10:03:17 UTC
  • mfrom: (3224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080216100317-xg1hdw306evlgt94
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_indirect.py
58
58
    def __init__(self, base):
59
59
        super(LaunchpadTransport, self).__init__(base)
60
60
        # We only support URLs without a netloc
61
 
        netloc = urlsplit(base)[1]
62
 
        if netloc != '':
 
61
        self.lp_instance = urlsplit(base)[1]
 
62
        if self.lp_instance == '':
 
63
            self.lp_instance = None
 
64
        elif self.lp_instance not in LaunchpadService.LAUNCHPAD_INSTANCE:
63
65
            raise errors.InvalidURL(path=base)
64
66
 
65
67
    def _requires_launchpad_login(self, scheme, netloc, path, query,
80
82
        path = urlsplit(abspath)[2].lstrip('/')
81
83
        # Perform an XMLRPC request to resolve the path
82
84
        resolve = _request_factory(path)
83
 
        service = LaunchpadService()
 
85
        service = LaunchpadService(lp_instance=self.lp_instance)
84
86
        try:
85
87
            result = resolve.submit(service)
86
88
        except xmlrpclib.Fault, fault: