[minion-cvs] Block deprecated commands, add test for broken python i...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv13835

Modified Files:
	TODO setup.py 
Log Message:
Block deprecated commands, add test for broken python installations on solaris.

Index: TODO
===================================================================
RCS file: /home/minion/cvsroot/src/minion/TODO,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- TODO	13 Jun 2003 01:03:45 -0000	1.123
+++ TODO	21 Jun 2003 07:24:06 -0000	1.124
@@ -39,12 +39,16 @@
                 - 'Iffy mode' messages are confusing.
         - Configurability:
                 - Ability to disable or relax directory paranoia.
-                - Trusted groups, trusted users for directory permissions
-        - Deferred tests
+                - Trusted groups, trusted users for directory
+                  permissions
+                - Change maximum on Overlap.
+        - Tests
                 - Tests for online key rotation
                 - Tests for ServerInbox and Directory.py
                 - Tests for checkConsistency
+                - What happens when Overlap > Lifetime?
         - Make 'SIGHUP' reload, (and 'SIGUSR' dump).
+        - Change descriptors to accept YYYY-MM-DD.
         . Performance
                 o Lazy-load deliverable messages.
                 o Don't block while shredding messages at startup.
@@ -53,7 +57,10 @@
 
 For 0.0.6:
         - Dummies and pinging
-        - Rudimentary MIME support (content-type, content-encoding only.)
+        - Rudimentary MIME support (content-type, content-encoding
+          only.)
+        - Servers need to download and use directories
+        - Servers redirect to latest IP if old IP is down.
 
 Require for "0.1.0" (the in-theory-as-good-as-type-II release):
 [Release criteria: Workable replacement for type II.  At least as

Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- setup.py	12 Jun 2003 06:30:40 -0000	1.63
+++ setup.py	21 Jun 2003 07:24:06 -0000	1.64
@@ -30,7 +30,17 @@
 try:
     import zlib
 except ImportError:
-    print "Zlib support seems to be missing; install python with zlib support."
+    print "Zlib support seems to be missing; install Python with zlib support."
+    sys.exit(1)
+
+try:
+    import _socket
+    del _socket
+except ImportError:
+    print "Your Python installation is somehow missing socket support."
+    if sys.platform.startswith("sunos") or sys.platform.startswith("solaris"):
+        print "This is a known issue when building some versions of Python"
+        print "on Solaris."
     sys.exit(1)
 
 import os, re, shutil, string, struct