← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
856
856
        self._socket.close()
857
857
        try:
858
858
            self._callback(s, self.stop_event)
 
859
        except socket.error:
 
860
            pass #Ignore socket errors
859
861
        except Exception, x:
860
862
            # probably a failed test
861
863
            warning('Exception from within unit test server thread: %r' % x)