← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
1019
1019
            def close(self):
1020
1020
                pass
1021
1021
 
1022
 
        server = paramiko.SFTPServer(FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
1023
 
                                     root=self._root, home=self._server_homedir)
 
1022
        server = paramiko.SFTPServer(
 
1023
            FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
 
1024
            root=self._root, home=self._server_homedir)
1024
1025
        try:
1025
 
            server.start_subsystem('sftp', None, sock)
 
1026
            server.start_subsystem(
 
1027
                'sftp', None, ssh.SocketAsChannelAdapter(sock))
1026
1028
        except socket.error, e:
1027
1029
            if (len(e.args) > 0) and (e.args[0] == errno.EPIPE):
1028
1030
                # it's okay for the client to disconnect abruptly