[MERGE] (trivial) SFTPTransport._translate_io_exception: better detection of the

[Christophe TROESTLER]

Hi,

In working on bug #123475, I was wondering why _show_push_branch (in
push.py) did not report the message that the directory existed but did
not have a .bzr/ subdir.  It turns out that a case for raising
`FileExists' in sftp.py (_translate_io_exception) has to be added.

Cheers,
C.

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: christophe.troestler at umh.ac.be-20080718194045-\
#   o6jomne7rnziglmq
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 2e731f04e3f68cd66e0ead3e69118b3ccd8c57a0
# timestamp: 2008-07-18 21:42:25 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
# 
# Begin patch
=== 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:40:45 +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
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSGWjowAAYhfgABUUef//1sA
TAr////wUAOtPclZZraNaYSSTIqbwRPTJip+VHtFPKegTT0mmGjJAJKEGTKZNopP0CmBDYkep5QG
mJgIp+qZTIwjRowmCGjI0NA0NGTCHNMTAAmACYAATAAEwSSCaYk0NGRT1PKep6noTQekANDIaRVZ
8Lm8/U77I+NcieMp2x0YxdEALvm7DPJL0pQKNXCGk/KwAKmgqjpGxrnLZgOarSyIVWDgU5LvSKIS
dTMRMggCY5dV88snm/LQ1l4nWVRCJcNJXuIuLFW+61saybkmFjsNc+kVidHW90rwHGQHNYr0elQt
Blnf3owojFS2/QnpnLAYQ9PIkOAwoaxkbRGDhGMo2Di38RPm6RWxV2JjzY2J2UZuqfJzhpG8nSNm
riW6aCR9Kht4nZhpSWvm7ghPI1FPEtoDzTjbE9QuIGQ3Ix8avKGd7rCxJ5mNmD222JVKB4mF5QJF
qU5r+jHduIUM2ctI3KweNqYdIaCpKNxlS42UKm0wUg5CoqsT6xiCZPDGh2NZJQutM8DQSFwV9OeJ
aIZBIYjQYufQeYkR+REt1sOS36DWTmPLzovd9dssxRVKpU9TEAh2HBdbC8GOEV8Bp6WdTanMZfTy
OyyKNxIzou1SgUvBj1h4xP95/jnXy5wyzYddSntZDoeT8Wt0dhEO05nUbzy6EwOOe83hd89JogF1
opkOnFd2+siHTwmYlBECerdrIfxagkBTtDeaSQyygfy4GnVhuLky2iaj9VmV9pIknJj0Qe81nHsn
1msbpA6X8fdyUfRHwMDM/WdItrbDxM1zbaBnhTcWPmj17rE37TEUzqr5XtcA8mGBNaED/hIDb6bJ
J8MrIbWGcvJuNxifY0G4uO/lPgyyDsnT1CmLYeOtZYUyAc4H3oJ+rL+EiVSknKsESPPi01C8Lxms
jLt4Ub8HPoskZmFdzA0oNZ5bbOriLYPUKg4OArkGHTtFxr1r9i0KR0yqUAv/k0pciopQEbCLwkKD
vlBdQPZFE5ZhcLBPeIniHkKAj0xRigsYLV1pyzdHBdUY44KgqK0LQQv9l+HllgzH+/lZhOsFJphk
0wYggHdqO/jIV/XloZPgUs9qCq+Aq1GSjnCVgw3ycOWyM3J7honXkepW+l9TPwgUloDZKZfhUrBk
FiCQMNHnf5zTzeU1GoZ9Zm4lc7Go4z5VEi5cgwxfqSiOJsmvuenl6sXspyA4qmbesVVZgIttTQ8m
8UxXXRTWsfleRFX7i7kinChIEMtHRgA=