From: Brian Warner <warner@lothar.com>
Date: Fri, 31 Jul 2009 18:32:26 +0000 (-0700)
Subject: ftpd: update docs, point to Twisted ticket for the proposed patch
X-Git-Tag: allmydata-tahoe-1.5.0~7
X-Git-Url: https://git.rkrishnan.org/vdrive/class-simplejson.JSONEncoder-index.html?a=commitdiff_plain;h=ad455111566a8fc352a2a6c64faf6ae1976d8f7c;p=tahoe-lafs%2Ftahoe-lafs.git

ftpd: update docs, point to Twisted ticket for the proposed patch
---

diff --git a/docs/frontends/FTP-and-SFTP.txt b/docs/frontends/FTP-and-SFTP.txt
index 0c44cde7..9559f55a 100644
--- a/docs/frontends/FTP-and-SFTP.txt
+++ b/docs/frontends/FTP-and-SFTP.txt
@@ -145,10 +145,11 @@ library that is frequently installed as /usr/lib/libcryptopp.a, to avoid
 problems with non-alphanumerics in filenames).
 
 The FTP server requires code in Twisted that enables asynchronous closing of
-file-upload operations. This code was not in the Twisted-8.1.0 release, and
-has not been committed to SVN trunk as of r24943. So it may be necessary to
-apply the following patch. The Tahoe node refuse to start the FTP server if
-it detects that this patch has not been applied.
+file-upload operations. This code was not in the Twisted-8.2.0 release, and
+has not been committed to SVN trunk as of r27213 (see
+http://twistedmatrix.com/trac/ticket/3462 for details). So it may be
+necessary to apply the following patch. The Tahoe node will refuse to start
+the FTP server if it detects that this patch has not been applied.
 
 Index: twisted/protocols/ftp.py
 ===================================================================
diff --git a/src/allmydata/frontends/ftpd.py b/src/allmydata/frontends/ftpd.py
index c187d86a..e9447716 100644
--- a/src/allmydata/frontends/ftpd.py
+++ b/src/allmydata/frontends/ftpd.py
@@ -289,7 +289,8 @@ class FTPServer(service.MultiService):
         service.MultiService.__init__(self)
 
         # make sure we're using a patched Twisted that uses IWriteFile.close:
-        # see docs/frontends/ftp.txt for details.
+        # see docs/frontends/FTP-and-SFTP.txt and
+        # http://twistedmatrix.com/trac/ticket/3462 for details.
         assert "close" in ftp.IWriteFile.names(), "your twisted is lacking"
 
         r = Dispatcher(client)