Document, FTP: handle case of move into existing name.

Unlike unix 'mv', we do not allow move to point to an existing 'new_name'.

bzr revid: p_christ@hol.gr-20100714125232-fmm9sm1nc30nz92k

2 files changed, 4 insertions, 1 deletions

diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 9b0f5b562e4..2ddfcc2bb7d 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -403,7 +403,9 @@ class abstracted_fs(object):
             # API shouldn't wait for us to write the object
             assert (ret is True) or (ret is False)
             cr.commit()
-        except Exception,err:
+        except EnvironmentError:
+            raise
+        except Exception, err:
             self._log.exception('Cannot rename "%s" to "%s" at "%s"', src, datacr[2], datacr[1])
             raise OSError(1,'Operation not permited.')
 
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index 88e48bf31bf..692abc4aef4 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -1464,6 +1464,7 @@ class FTPHandler(asynchat.async_chat):
                 errno.EINVAL: 504,
                 errno.ENOENT: 550,
                 errno.EREMOTE: 450,
+                errno.EEXIST: 521,
                 }
 
         # mlsx facts attributes