Rev 3322: Handle vsftp RNFR return code (Marcus Trautwig) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3322
revision-id:pqm at pqm.ubuntu.com-20080401035104-fnjlf47gtles4byl
parent: pqm at pqm.ubuntu.com-20080401021614-ec34l5pd7xp7bkku
parent: ian.clatworthy at canonical.com-20080401004612-q5fypkh7gnzj6cwa
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-04-01 04:51:04 +0100
message:
  Handle vsftp RNFR return code (Marcus Trautwig)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 3319.1.1
    revision-id:ian.clatworthy at canonical.com-20080401004612-q5fypkh7gnzj6cwa
    parent: pqm at pqm.ubuntu.com-20080331105632-qxz6ssqxpb7sb0hv
    parent: tschaboo at gmx.at-20080330014150-cmkkvx5bg16zbz31
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Tue 2008-04-01 10:46:12 +1000
    message:
      Handle vsftp RNFR return code (Marcus Trautwig)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 3315.1.1
    revision-id:tschaboo at gmx.at-20080330014150-cmkkvx5bg16zbz31
    parent: pqm at pqm.ubuntu.com-20080329121122-edbj8ht3fbr35nfs
    committer: Christian Tschabuschnig <tschaboo at gmx.at>
    branch nick: bzr.dev
    timestamp: Sun 2008-03-30 03:41:50 +0200
    message:
      support vsftp (#129786)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
=== modified file 'NEWS'
--- a/NEWS	2008-04-01 02:16:14 +0000
+++ b/NEWS	2008-04-01 03:51:04 +0000
@@ -67,6 +67,9 @@
 
     * Launchpad locations (lp: URLs) can be pulled.  (Aaron Bentley, #181945)
 
+    * vsftp's return ``550 RNFR command failed.`` supported.
+      (Marcus Trautwig, #129786)
+
   DOCUMENTATION:
 
     * Improved documentation on send/merge relationship. (Peter Schuller)

=== modified file 'bzrlib/transport/ftp.py'
--- a/bzrlib/transport/ftp.py	2008-02-10 15:51:22 +0000
+++ b/bzrlib/transport/ftp.py	2008-03-30 01:41:50 +0000
@@ -178,6 +178,7 @@
             or 'no such dir' in s
             or 'could not create file' in s # vsftpd
             or 'file doesn\'t exist' in s
+            or 'rnfr command failed.' in s # vsftpd RNFR reply if file not found
             or 'file/directory not found' in s # filezilla server
             ):
             raise errors.NoSuchFile(path, extra=extra)