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

[Christophe TROESTLER]

On Fri, 18 Jul 2008 21:46:50 +0200 (CEST), Christophe TROESTLER wrote:
> 
> 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.

Actually, much to my surprise, this simple fix actually closes the
bug!  So I am resending it with the proper bug number in the subject
line.  Sorry for the noise of the previous mail.

Regards,
C.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: christophe.troestler at umh.ac.be-20080718195108-\
#   0kgfigpaqipeq71e
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 60243636283ebad0884365283d72cb0c60e4e36c
# timestamp: 2008-07-18 21:52:22 +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: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
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVbPJ74AAZDfgABUWef//1sA
TAr/7//wUAOteaOm7dtIOgSkTQBBlPJieiNJ6gYgZGR6mjTQMpTGoeFHoTIaAAAAAAASmkFR5TbU
anqaaNBoaaBoAMhpoBzTEwAJgAmAAEwABMEkgmgNJhNTEmZBGJppiDIDJo5TLZWrj5pQ7hO8jBSR
qhmscYBTWtrXviKVEeN+PVvepN1EkV+pqjOF+kTLKMNWPxxj8l62KWnB+6XdcE3DcQkS8tjY4X5W
MmVsrEW7kcELGKoJe8cwUZdeahTglkxHyRQuPoOe3lTRyrdXABxwA/q41wglcsTfqh80N7oivvd1
ZJ6csRhEXqBQR5D9GsoRRrEZOE8RIqqk8cl75DNWeA0r5Umqk1Q6G43sOfvlbguh5xuHLMxrkaVL
An3cSDsiXZCfMcRAvpzfrQrB/ETeDEj0UDEx/wSgaiREdjLulsLnVSKJkC401PbZtLAr9DLArLhq
St69RiYu/dGZflatRE2GMh+xh2A0lPQRpiDYSt5pmDZ5QEgioLAMkIdKmjBIoLLWxh0o1mt+FRaK
lhFI9BkSIDWQrLy12hAlm1Iz0qDEpiPKiY87l28vTXZc2OKtT1cRCPxPBdjC8WPB/JEV6j0uIqCM
nDoOzDCbmynhnasCkQR8Z5+kZfVn59vr5r25KrrcJ0xVqQW/xZSqKPQOhAbTtLT+9CEC5/KYy0Pj
9sTCAUiuYVZCfBeHbIsMC8qA1Z9fN5rmCsB/KMwUGBEwVANQVwq1t2cOKKb8RWwtMLQ4MLxQtiiR
xRFZu1Zie4rFuJuA0u/X2tEfeifjGmRmkvnuOBlztzzGgFJfxhOMKOnp1pvJMiOOApU+OLngVEQy
MUqQIKJAOHSyRIIaYobTPOZjqI+BtJRpiGiYXwaFJUHXF4aZhLxJBGnOpM90jQFrDQxQGPXf0H0S
dH5DPgiUD13G4X0YZtcTboFvXxuhbRmMwv2K3rAwQZntsl16Dk/pFaDw5BXIMt/LX1LAV6oPnrrK
gJ+tUt46hkGhB4PbxeucHsipOXua4Ru0B4j5QRmgtYJLoTld2ODCjqE2eeSiSLhVIWwsw9l31Flg
2f3+iclxCrFa8ug4zZBAO/M898hXbtL2T4Fc+tg2mrrEzRoE5CFsOO29MytFxQfET4mw6MVqjtiT
NAG5VYu1TW1kFCCQMNHhPcYc7yvIyGfZUbSVrtdg4v0sEi1cAx1vySiOKmTTtenk1Qurys4Ab1ZP
xWitUwIttTVfx3gmWrVYnOanZiUf8XckU4UJBWzye+A=