[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Generate exception messages correctly; remove needless ...
Update of /home/minion/cvsroot/src/minion/lib/mixminion/directory
In directory moria.mit.edu:/tmp/cvs-serv2477/lib/mixminion/directory
Modified Files:
ServerList.py
Log Message:
Generate exception messages correctly; remove needless space
Index: ServerList.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/directory/ServerList.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ServerList.py 28 Nov 2003 04:14:04 -0000 1.44
+++ ServerList.py 8 Dec 2003 02:22:56 -0000 1.45
@@ -153,7 +153,7 @@
if self.idCache.containsServer(server):
LOG.warn("Server %s already known", nickname)
except mixminion.directory.MismatchedID:
- raise MixFatalError("Mismatched ID for server %s", nickname)
+ raise MixFatalError("Mismatched ID for server %s" % nickname)
LOG.info("Learning identity for new server %s", nickname)
self.idCache.insertServer(server)
@@ -451,11 +451,11 @@
try:
ident = self.serverIDs[lcn]
except KeyError:
- raise UIError("No stored key for server %s",
+ raise UIError("No stored key for server %s" %
s.getNickname())
if not pk_same_public_key(ident, s.getIdentity()):
- raise UIError("Inconsistent stored key for server %s",
+ raise UIError("Inconsistent stored key for server %s" %
s.getNickname())
# Then, rebuild self.serversByNickname