~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/client.py

  • Committer: Jeff Abbott
  • Date: 2008-03-05 15:48:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3278.
  • Revision ID: fdiv_bug@sniping.org-20080305154827-wi2v4a73t1yob23c
Applied John's proposed fix (from https://lists.ubuntu.com/archives/bazaar/2008q1/037864.html).

Show diffs side-by-side

added added

removed removed

Lines of Context:
87
87
        anything but path, so it is only safe to use it in requests sent over
88
88
        the medium from the matching transport.
89
89
        """
90
 
        if self._shared_connection.base.startswith('bzr+http://'):
 
90
        base = self._shared_connection.base
 
91
        if base.startswith('bzr+http://') or base.startswith('bzr+https://'):
91
92
            medium_base = self._shared_connection.base
92
93
        else:
93
94
            medium_base = urlutils.join(self._shared_connection.base, '/')