Rev 2978: (robertc) Correct a missing import in the test support ftp server. (Robert Collins, #161240) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2978
revision-id: pqm at pqm.ubuntu.com-20071109195036-5o5bwu0a01uniqwg
parent: pqm at pqm.ubuntu.com-20071109154145-1yq4oi390uk3z90o
parent: robertc at robertcollins.net-20071109182224-28t11ngzci4pr7e7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-11-09 19:50:36 +0000
message:
  (robertc) Correct a missing import in the test support ftp server. (Robert Collins, #161240)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
    ------------------------------------------------------------
    revno: 2975.2.1
    merged: robertc at robertcollins.net-20071109182224-28t11ngzci4pr7e7
    parent: pqm at pqm.ubuntu.com-20071107140948-l3p8njdhgwstdkri
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: bug-161240
    timestamp: Sat 2007-11-10 05:22:24 +1100
    message:
      * FTP server errors don't error in the error handling code.
        (Robert Collins, #161240)
=== modified file 'NEWS'
--- a/NEWS	2007-11-09 01:55:37 +0000
+++ b/NEWS	2007-11-09 19:50:36 +0000
@@ -55,6 +55,9 @@
    * Don't use timeout in HttpServer anymore.
      (Vincent Ladeuil, #158972).
 
+   * FTP server errors don't error in the error handling code.
+     (Robert Collins, #161240)
+
    * Obsolete packs are now cleaned up by pack and autopack operations.
      (Robert Collins, #153789)
 

=== modified file 'bzrlib/tests/ftp_server.py'
--- a/bzrlib/tests/ftp_server.py	2007-10-31 09:31:50 +0000
+++ b/bzrlib/tests/ftp_server.py	2007-11-09 18:22:24 +0000
@@ -20,6 +20,7 @@
 """
 
 import asyncore
+import errno
 import os
 import select
 import stat