← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Andrew Bennetts
  • Date: 2008-08-07 00:25:38 UTC
  • mfrom: (3612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3613.
  • Revision ID: andrew.bennetts@canonical.com-20080807002538-mtl1fcgy2fdabha4
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
584
584
            if (e.args == ('No such file or directory',) or
585
585
                e.args == ('No such file',)):
586
586
                raise NoSuchFile(path, str(e) + more_info)
587
 
            if (e.args == ('mkdir failed',)):
 
587
            if (e.args == ('mkdir failed',) or
 
588
                e.args[0].startswith('syserr: File exists')):
588
589
                raise FileExists(path, str(e) + more_info)
589
590
            # strange but true, for the paramiko server.
590
591
            if (e.args == ('Failure',)):