/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/ftp.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-04 12:28:56 UTC
  • mfrom: (2584 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070704122856-7jn5e6ou08ukimof
merge bzr.dev @ 2584 resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
162
162
            or 'could not open' in s
163
163
            or 'no such dir' in s
164
164
            or 'could not create file' in s # vsftpd
 
165
            or 'file doesn\'t exist' in s
165
166
            ):
166
167
            raise errors.NoSuchFile(path, extra=extra)
167
168
        if ('file exists' in s):
289
290
                    raise e
290
291
                raise
291
292
        except ftplib.error_perm, e:
292
 
            self._translate_perm_error(e, abspath, extra='could not store')
 
293
            self._translate_perm_error(e, abspath, extra='could not store',
 
294
                                       unknown_exc=errors.NoSuchFile)
293
295
        except ftplib.error_temp, e:
294
296
            if retries > _number_of_retries:
295
297
                raise errors.TransportError("FTP temporary error during PUT %s. Aborting."