[MERGE] [Bug #123475] SFTPTransport._translate_io_exception: better detection

[Christophe TROESTLER]

On Fri, 18 Jul 2008 15:03:09 -0500, John Arbash Meinel wrote:
> 
> If you fixed the bug, it would be best to include a NEWS entry stating this.

Done.  (I always forget.)

C.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: christophe.troestler at umh.ac.be-20080718201920-\
#   lvt8l822l4v4qs4z
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 2a7e3fdc72dd26cd437c69950c89e937ebb53810
# timestamp: 2008-07-18 22:20:36 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2008-07-18 08:40:57 +0000
+++ NEWS	2008-07-18 20:19:20 +0000
@@ -27,6 +27,8 @@
     * Fix a test case that was failing if encoding wasn't UTF-8.
       (John Arbash Meinel, #247585)
 
+    * sftp transport: added missing `FileExists' case to
+      _translate_io_exception (Christophe Troestler, #123475)
 
   DOCUMENTATION:
 

=== modified file 'bzrlib/transport/sftp.py'
--- bzrlib/transport/sftp.py	2008-07-09 09:36:41 +0000
+++ bzrlib/transport/sftp.py	2008-07-18 19:51:08 +0000
@@ -584,7 +584,8 @@
             if (e.args == ('No such file or directory',) or
                 e.args == ('No such file',)):
                 raise NoSuchFile(path, str(e) + more_info)
-            if (e.args == ('mkdir failed',)):
+            if (e.args == ('mkdir failed',) or
+                e.args[0].startswith('syserr: File exists')):
                 raise FileExists(path, str(e) + more_info)
             # strange but true, for the paramiko server.
             if (e.args == ('Failure',)):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSp6454AAwJfgFBUWff//3sB
TIr/7//wUAXmTwAAuxi2wBQEkpiTI1PTSn6ao/TFJ7Eo9R6hoDymJ6Q09TymglSgPUPIgM1A00Gg
GgAAAAGqeKm0gB5QAbUAAAAA0NAHNMTJk0YTBMTTAJgEMEYEYBJImQGQTCIE0Mp6ZPSmZT1PKaaa
GmRpBV2U1ayi6I8N5wbyLdcsbeNxKKMGFSMp3YT5YRpLPB97yR2EI/1lxqQpQv7yg2yeeXrDuJhh
mZlDiHJ4UEC0DFmK6g6hlEEPBpNcYSC8JYnPOmQgYPwgMERgjapHKJAFjMAyAiwzVmmcWA8kk+Lz
tYlX5lNEVaakOe8pHgjBPGKlL2DvFlNTjZq3WOvjQVGyso5AySx9BsNtYqSZMSyPmaIzQEERaIMO
XNYLbGAYrgHqqnBzneQhuVRBNjnicRQ9jjZUJyNRgRWVUKBQJqxRpP8Im8ZWkHFO/7DJBs9BQCHw
Lra3iteU/W0rLhwxxtPMR4VZBRJyKpUK4/d7kH5OxOJ5p8Moxx1IVxyB2YwX8T7xN5YtxPysSDsg
BLcgfMHGJFCwr0MBUGyBUikMLUcEXGsnjzFQSYsJFx/qiSOvS8/GgmWcqiEBwTgYjFwxWbx2+pXk
xzRPKUjLoLS41jhMtvsMyIWmDPfoMO1mbF5JgZRquImcDAIF5gbC7BfAUJhlJSrDEaoYeg8uaOeZ
EYZ2/JZGhmVHAvKShaFpFsrNqCi2kxfFOXAsjSQrJ2XrInDBEjcXVOtTisSMDA50GhaZ0GZcuFhZ
eSs1mYCxMym+Y+goPFWThLQtJoLWBDrSlwLUYWwsSNtbOLR1ReVPvG0IHvFjDYKSzezhVmQ99pc5
BAoKzUuVA8iUjDzgvh039l1yvTTNnMEhOUwglCoP1FxGBeYweTzUgDF0x2544dewzD2ext0HzDia
DyI4Khhw8o/NWCCqZFMMDH9d5UefoQ/iyHCX/ElDc+ihz6RLsKFptNhfwKNQmuZBEZN77WZjstot
kAJAxDmdohMZAcIRKdY2IDBNU6MHAvIXxw/bgG8dAoZFqDcyRIjA7UeC8KTkGDYwJpjiPMh5cIM8
+XY+a7gPhIQQcpnxLi8kOgQNvtI8iB0k/kcxV6uJuBnDDk2VBpewSL08NW0c4nNJ1IgJjedU8yDA
n5+ktHUUDi8O3dSXewMF63vZdYgdA3/2IAyEdZZNLOYjypnQtNJnNxabQ4g+Vl7SgGHpSGjKE1sc
KyR5TmG2yG4rTcRXRCLTXRBcTaejx4gsIAahoLlQirfcAb/f/xhIRLKqnRcZT4xhFKg4LfuFYpAo
JI2DyA6l0mDrI1C9Rm3EL9CRQgmQWnQrVVl5OWiDyc4DWoMIMff1fhFIBHUTTp3OY9aCqAfjnDnQ
ejAwxtAOXelLLu5x5AkUkQZgX1QXdoBvyQjVb3lJ7tk5PhyILksugURfETFXqEYIRHpOkkeIu0Mx
ZIpDwN5aFgg2zPvYVHrBxSw9klEHD0nj3DrigXUlQyRWnC6Mcnl4kczxPSDvPbBBFCJMlUjrXOzx
Xt3MjcU+5A2pqaCgFJegrQlyK3d+i8ay0tBjU9DyThHBBYLxFKhTg5asCKEvA0XzbqKUiZzmxgMJ
5QWR70ItRXYhgCi8CMAYGpcDiDBw5Hr1i7FEeDEHcgVGCr7tFlLQLiMNAS1gERiphYIzhBi5kIiQ
ipJk0MfbjzHaJszrKAupC9MPLrFmFJJ1m9gcGHAtQh7AlcLqFuNYUZgDRTBWwmncPV9AXqld3oSO
oQexXYHitV1CmLAA1FxqvoOZMS+Q6HerXi3FRNOTjrcUzFpqqj/xdyRThQkCp6454A==