SHARE
TWEET
Untitled
a guest
Jul 25th, 2012
4
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
- === modified file bzrlib/errors.py
- --- bzrlib/errors.py 2012-07-19 19:27:22 +0000
- +++ bzrlib/errors.py 2012-07-25 18:15:40 +0000
- @@ -1618,6 +1618,12 @@
- self.exc_type, self.exc_value, self.exc_tb)
- self.traceback_text = ''.join(traceback_strings)
- +class TransportOperationNotSupported(TransportError):
- +
- + _fmt = "Transport operation is not supported: %(operation)s"
- +
- + def __init__(self, operation):
- + self.operation = operation
- # A set of semi-meaningful errors which can be thrown
- class TransportNotPossible(TransportError):
- === modified file bzrlib/transport/sftp.py
- --- bzrlib/transport/sftp.py 2011-12-19 13:23:58 +0000
- +++ bzrlib/transport/sftp.py 2012-07-25 22:26:32 +0000
- @@ -703,7 +703,7 @@
- or getattr(e, 'errno', None) == errno.ENOTEMPTY):
- raise errors.DirectoryNotEmpty(path, str(e))
- if e.args == ('Operation unsupported',):
- - raise errors.TransportNotPossible()
- + raise errors.TransportNotPossible(more_info)
- mutter('Raising exception with args %s', e.args)
- if getattr(e, 'errno', None) is not None:
- mutter('Raising exception with errno %s', e.errno)
- @@ -731,7 +731,10 @@
- self._get_sftp().rename(self._remote_path(rel_from),
- self._remote_path(rel_to))
- except (IOError, paramiko.SSHException), e:
- - self._translate_io_exception(e, rel_from,
- + if e != None and e.args == ('Operation unsupported',):
- + raise errors.TransportOperationNotSupported("rename")
- + else:
- + self._translate_io_exception(e, rel_from,
- ': unable to rename to %r' % (rel_to))
- def _rename_and_overwrite(self, abs_from, abs_to):
- @@ -745,7 +748,10 @@
- rename_func=sftp.rename,
- unlink_func=sftp.remove)
- except (IOError, paramiko.SSHException), e:
- - self._translate_io_exception(e, abs_from,
- + if e != None and e.args == ('Operation unsupported',):
- + raise errors.TransportOperationNotSupported("rename")
- + else:
- + self._translate_io_exception(e, abs_from,
- ': unable to rename to %r' % (abs_to))
- def move(self, rel_from, rel_to):
RAW Paste Data
