patch: fix sftp paths

[John A Meinel]

James Henstridge wrote:
> 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.

Yeah, I just merged against bzr.dev and that whole area gets really
messy with conflicts.

I think I resolved it a little bit better in my sftp-fix branch. I'm
still making sure that I've merged all the other changes, so it may be a
little while before I pull this into my integration branch. But maybe it
will still happen today.

> 
> I think the if statement should go altogether.
> 
> James.
> 
> 

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051130/12b59c08/attachment.pgp