Rev 2571: (John Arbash Meinel) A couple small updates for pushing over ftp. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2571
revision-id: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
parent: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-02 19:36:15 +0100
message:
  (John Arbash Meinel) A couple small updates for pushing over ftp.
modified:
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 2570.1.1
    merged: john at arbash-meinel.com-20070702173553-nv2vsogfk2cvs9p7
    parent: pqm at pqm.ubuntu.com-20070702162743-tp7a6o66eln52zly
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-07-02 12:35:53 -0500
    message:
      (John Arbash Meinel) A couple small updates for pushing over ftp.
=== modified file 'bzrlib/transport/ftp.py'
--- a/bzrlib/transport/ftp.py	2007-04-18 14:06:46 +0000
+++ b/bzrlib/transport/ftp.py	2007-07-02 17:35:53 +0000
@@ -166,6 +166,7 @@
             or 'could not open' in s
             or 'no such dir' in s
             or 'could not create file' in s # vsftpd
+            or 'file doesn\'t exist' in s
             ):
             raise errors.NoSuchFile(path, extra=extra)
         if ('file exists' in s):
@@ -329,7 +330,8 @@
                     raise e
                 raise
         except ftplib.error_perm, e:
-            self._translate_perm_error(e, abspath, extra='could not store')
+            self._translate_perm_error(e, abspath, extra='could not store',
+                                       unknown_exc=errors.NoSuchFile)
         except ftplib.error_temp, e:
             if retries > _number_of_retries:
                 raise errors.TransportError("FTP temporary error during PUT %s. Aborting."