[minion-cvs] More patches to directory code

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	DirMain.py ServerInbox.py 
Log Message:
More patches to directory code

Index: DirMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/DirMain.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- DirMain.py	28 May 2003 06:37:37 -0000	1.12
+++ DirMain.py	28 May 2003 07:54:08 -0000	1.13
@@ -79,7 +79,7 @@
 
     d = getDirectory()
     inbox = d.getInbox()
-    inbox.listPendingServers(sys.stdout)
+    inbox.listNewPendingServers(sys.stdout)
 
 def cmd_import(args):
     d = getDirectory()

Index: ServerInbox.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerInbox.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ServerInbox.py	28 May 2003 07:45:52 -0000	1.4
+++ ServerInbox.py	28 May 2003 07:54:08 -0000	1.5
@@ -33,7 +33,7 @@
            ServerQueued on wait-for-admin.
            """
         try:
-            server = ServerInfo(string=contents,assumeValid=0)
+            server = ServerInfo(string=text,assumeValid=0)
         except MixError, e:
             LOG.warn("Rejected invalid server from %s: %s", source,e)
             raise UIError("Server descriptor was not valid: %s"%e)
@@ -141,6 +141,9 @@
 
         sorted = nicknames.keys()
         sorted.sort()
+        if not sorted:
+            print >>f, "No incoming descriptors"
+            return    
         maxlen = max([len(n) for n in sorted])
         format = " %"+str(maxlen)+"s:%s [%s descriptors]"
         for lcnickname in sorted: