[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Tweak makefile a bit



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

Modified Files:
	ServerList.py 
Log Message:
Tweak makefile a bit

Index: ServerList.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerList.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ServerList.py	29 May 2003 02:01:34 -0000	1.23
+++ ServerList.py	30 May 2003 02:11:11 -0000	1.24
@@ -137,6 +137,12 @@
             self._lock()
             ident = server.getIdentity()
             nickname = server.getNickname()
+            try:
+                if self.idCache.containsServer(server):
+                    LOG.warn("Server %s already known", nickname)
+            except mixminion.directory.MismatchedID:
+                raise MixFatalError("Mismatched ID for server %s", nickname)
+                
             LOG.info("Learning identity for new server %s", nickname)
             self.idCache.insertServer(server)
             writePickled(os.path.join(self.serverIDDir,