/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 bzrlib/plugins/launchpad/lp_directory.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
63
63
                 _request_factory=ResolveLaunchpadPathRequest,
64
64
                 _lp_login=None):
65
65
        """Resolve the base URL for this transport."""
 
66
        service = LaunchpadService.for_url(url)
66
67
        result = urlsplit(url)
67
 
        # Perform an XMLRPC request to resolve the path
68
 
        lp_instance = result[1]
69
 
        if lp_instance == '':
70
 
            lp_instance = None
71
 
        elif lp_instance not in LaunchpadService.LAUNCHPAD_INSTANCE:
72
 
            raise errors.InvalidURL(path=url)
73
68
        resolve = _request_factory(result[2].strip('/'))
74
 
        service = LaunchpadService(lp_instance=lp_instance)
75
69
        try:
76
70
            result = resolve.submit(service)
77
71
        except xmlrpclib.Fault, fault:
79
73
                path=url, extra=fault.faultString)
80
74
 
81
75
        if 'launchpad' in debug.debug_flags:
82
 
            trace.mutter("resolve_lp_path(%r) == %r", path, result)
 
76
            trace.mutter("resolve_lp_path(%r) == %r", url, result)
83
77
 
84
78
        if _lp_login is None:
85
79
            _lp_login = get_lp_login()