/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: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_directory.py
26
26
    trace,
27
27
    transport,
28
28
    )
 
29
from bzrlib.i18n import gettext
29
30
 
30
31
from bzrlib.plugins.launchpad.lp_registration import (
31
32
    LaunchpadService, ResolveLaunchpadPathRequest)
130
131
            else:
131
132
                # There are either 0 or > 2 path parts, neither of which is
132
133
                # supported for these schemes.
133
 
                raise errors.InvalidURL('Bad path: %s' % result.path)
 
134
                raise errors.InvalidURL('Bad path: %s' % url)
134
135
            # Expand any series shortcuts, but keep unknown series.
135
136
            series = distro_series.get(series, series)
136
137
            # Hack the url and let the following do the final resolution.
164
165
            if 'launchpad' in debug.debug_flags:
165
166
                local_res = result
166
167
                result = self._resolve_via_xmlrpc(path, url, _request_factory)
167
 
                trace.note('resolution for %s\n  local: %s\n remote: %s'
168
 
                           % (url, local_res['urls'], result['urls']))
 
168
                trace.note(gettext(
 
169
                    'resolution for {0}\n  local: {1}\n remote: {2}').format(
 
170
                           url, local_res['urls'], result['urls']))
169
171
        else:
170
172
            result = self._resolve_via_xmlrpc(path, url, _request_factory)
171
173