← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-02 17:35:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2571.
  • Revision ID: john@arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
(John Arbash Meinel) A couple small updates for pushing over ftp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp.py
166
166
            or 'could not open' in s
167
167
            or 'no such dir' in s
168
168
            or 'could not create file' in s # vsftpd
 
169
            or 'file doesn\'t exist' in s
169
170
            ):
170
171
            raise errors.NoSuchFile(path, extra=extra)
171
172
        if ('file exists' in s):
329
330
                    raise e
330
331
                raise
331
332
        except ftplib.error_perm, e:
332
 
            self._translate_perm_error(e, abspath, extra='could not store')
 
333
            self._translate_perm_error(e, abspath, extra='could not store',
 
334
                                       unknown_exc=errors.NoSuchFile)
333
335
        except ftplib.error_temp, e:
334
336
            if retries > _number_of_retries:
335
337
                raise errors.TransportError("FTP temporary error during PUT %s. Aborting."