← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: toto at example
  • Date: 2010-09-27 19:31:45 UTC
  • mfrom: (5050.17.27 2.2)
  • mto: This revision was merged to the branch mainline in revision 5448.
  • Revision ID: toto@example.com-20100927193145-bly1dw5wjd23hiwy
Merge lp:bzr/2.2 into trunk including fixes for #644855, #646133, #632387

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
 
392
397
    def _get_sftp(self):
393
398
        """Ensures that a connection is established"""
394
399
        connection = self._get_connection()
715
720
            if (e.args[0].startswith('Directory not empty: ')
716
721
                or getattr(e, 'errno', None) == errno.ENOTEMPTY):
717
722
                raise errors.DirectoryNotEmpty(path, str(e))
 
723
            if e.args == ('Operation unsupported',):
 
724
                raise errors.TransportNotPossible()
718
725
            mutter('Raising exception with args %s', e.args)
719
726
        if getattr(e, 'errno', None) is not None:
720
727
            mutter('Raising exception with errno %s', e.errno)