Rev 3383: commit now works with Microsoft FTP (Andreas Deininger) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3383
revision-id:pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
parent: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
parent: ian.clatworthy at canonical.com-20080427223834-hcxv61ovf603klrt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 02:23:18 +0100
message:
  commit now works with Microsoft FTP (Andreas Deininger)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
    ------------------------------------------------------------
    revno: 3382.1.1
    revision-id:ian.clatworthy at canonical.com-20080427223834-hcxv61ovf603klrt
    parent: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2008-04-28 08:38:34 +1000
    message:
      commit now works with Microsoft FTP (Andreas Deininger)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
=== modified file 'NEWS'
--- a/NEWS	2008-04-26 16:40:57 +0000
+++ b/NEWS	2008-04-27 22:38:34 +0000
@@ -29,6 +29,9 @@
     * Avoid muttering every time a child update does not cause a progress bar
       update. (John Arbash Meinel, #213771)
 
+    * ``bzr commit`` now works with Microsoft's FTP service.
+      (Andreas Deininger)
+
     * Set SO_REUSEADDR on server sockets of ``bzr serve`` to avoid problems
       rebinding the socket when starting the server a second time.
       (John Arbash Meinel, Martin Pool, #164288)

=== modified file 'bzrlib/transport/ftp.py'
--- a/bzrlib/transport/ftp.py	2008-03-30 01:41:50 +0000
+++ b/bzrlib/transport/ftp.py	2008-04-27 22:38:34 +0000
@@ -180,6 +180,8 @@
             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
+            # Microsoft FTP-Service RNFR reply if file not found
+            or (s.startswith('550 ') and 'unable to rename to' in extra)
             ):
             raise errors.NoSuchFile(path, extra=extra)
         if ('file exists' in s):