patch: fix sftp paths
James Henstridge
james at jamesh.id.au
Wed Nov 30 10:57:15 GMT 2005
Robey Pointer wrote:
> This patch fixes absolute SFTP paths to work again after James' patch
> (removes 3 lines of old code that are no longer needed now that we're
> properly un-parsing urls), and also fixes a unicode encoding issue in
> the exclusive-open code.
>
> robey
>
>
> === modified file 'bzrlib/transport/sftp.py'
> --- bzrlib/transport/sftp.py
> +++ bzrlib/transport/sftp.py
> @@ -570,9 +570,6 @@
> vendor = _get_ssh_vendor()
> if (self._path is None) or (self._path == ''):
> self._path = ''
> - else:
> - # remove leading '/'
> - self._path = urllib.unquote(self._path[1:])
> if vendor != 'none':
> sock = SFTPSubprocess(self._host, self._port,
> self._username)
> self._sftp = SFTPClient(sock)
Weird. This if/else branch does not exist at all in the branch I
submitted, and is slotted between two lines added by my branch. I guess
it was an incorrect conflict resolution.
I think the if statement should go altogether.
James.
More information about the bazaar
mailing list