/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-05 03:11:40 UTC
  • mfrom: (3691 +trunk)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080905031140-hj0adlcf30l7i99v
Merge in bzr.dev 3691

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
329
329
        cur_offset_and_size = offset_stack.next()
330
330
 
331
331
        for data in fp.readv(requests):
332
 
            cur_data += data
 
332
            cur_data.append(data)
333
333
            cur_data_len += len(data)
334
334
 
335
335
            if cur_data_len < cur_coalesced.length:
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',)):