Rev 2893: Recognize errors from Filezilla ftp server (Gary van der Merwe) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2893
revision-id: pqm at pqm.ubuntu.com-20071008022621-m0rzk7yfrfoszd38
parent: pqm at pqm.ubuntu.com-20071006144547-0e1mpht72yd6wyfz
parent: garyvdm at gmail.com-20071004144328-fbe33f1laegickto
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-10-08 03:26:21 +0100
message:
  Recognize errors from Filezilla ftp server (Gary van der Merwe)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 2885.3.1
    merged: garyvdm at gmail.com-20071004144328-fbe33f1laegickto
    parent: pqm at pqm.ubuntu.com-20071004071214-i0icltanhq59qtwt
    committer: Gary van der Merwe <garyvdm at gmail.com>
    branch nick: bzr.dev
    timestamp: Thu 2007-10-04 16:43:28 +0200
    message:
      Correctly detect a NoSuchFile when using a filezilla server.
=== modified file 'NEWS'
--- a/NEWS	2007-10-05 14:55:04 +0000
+++ b/NEWS	2007-10-08 02:26:21 +0000
@@ -128,6 +128,9 @@
    * ``WorkingTree.rename_one`` will now raise an error if normalisation of the
      new path causes bzr to be unable to access the file. (Robert Collins)
 
+   * Correctly detect a NoSuchFile when using a filezilla server. (Gary van der
+     Merwe)
+
   API BREAKS:
 
    * ``CommitBuilder.record_entry_contents`` now requires the root entry of a

=== modified file 'bzrlib/transport/ftp.py'
--- a/bzrlib/transport/ftp.py	2007-10-04 05:09:58 +0000
+++ b/bzrlib/transport/ftp.py	2007-10-04 14:43:28 +0000
@@ -167,6 +167,7 @@
             or 'no such dir' in s
             or 'could not create file' in s # vsftpd
             or 'file doesn\'t exist' in s
+            or 'file/directory not found' in s # filezilla server
             ):
             raise errors.NoSuchFile(path, extra=extra)
         if ('file exists' in s):