← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
389
389
                                         self._host, self._port)
390
390
        return connection, (user, password)
391
391
 
392
 
    def disconnect(self):
393
 
        connection = self._get_connection()
394
 
        if connection is not None:
395
 
            connection.close()
396
 
 
397
392
    def _get_sftp(self):
398
393
        """Ensures that a connection is established"""
399
394
        connection = self._get_connection()
720
715
            if (e.args[0].startswith('Directory not empty: ')
721
716
                or getattr(e, 'errno', None) == errno.ENOTEMPTY):
722
717
                raise errors.DirectoryNotEmpty(path, str(e))
723
 
            if e.args == ('Operation unsupported',):
724
 
                raise errors.TransportNotPossible()
725
718
            mutter('Raising exception with args %s', e.args)
726
719
        if getattr(e, 'errno', None) is not None:
727
720
            mutter('Raising exception with errno %s', e.errno)