/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/transport/sftp.py

[merge] bzr.dev 2359

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
1106
1106
 
1107
1107
    def get_url(self):
1108
1108
        """See bzrlib.transport.Server.get_url."""
1109
 
        return self._get_sftp_url(urlutils.escape(self._homedir[1:]))
 
1109
        homedir = self._homedir
 
1110
        if sys.platform != 'win32':
 
1111
            # Remove the initial '/' on all platforms but win32
 
1112
            homedir = homedir[1:]
 
1113
        return self._get_sftp_url(urlutils.escape(homedir))
1110
1114
 
1111
1115
 
1112
1116
class SFTPServerWithoutSSH(SFTPServer):
1153
1157
 
1154
1158
    def get_url(self):
1155
1159
        """See bzrlib.transport.Server.get_url."""
1156
 
        if sys.platform == 'win32':
1157
 
            return self._get_sftp_url(urlutils.escape(self._homedir))
1158
 
        else:
1159
 
            return self._get_sftp_url(urlutils.escape(self._homedir[1:]))
 
1160
        homedir = self._homedir
 
1161
        if sys.platform != 'win32':
 
1162
            # Remove the initial '/' on all platforms but win32
 
1163
            homedir = homedir[1:]
 
1164
        return self._get_sftp_url(urlutils.escape(homedir))
1160
1165
 
1161
1166
 
1162
1167
class SFTPHomeDirServer(SFTPServerWithoutSSH):