[minion-cvs] Fix bug that would crash when generating descriptors wi...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerKeys.py 
Log Message:
Fix bug that would crash when generating descriptors with guessed IPs

Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ServerKeys.py	30 May 2003 19:22:29 -0000	1.36
+++ ServerKeys.py	31 May 2003 12:59:12 -0000	1.37
@@ -736,8 +736,8 @@
         warn.errors -= 2 # We can't do anything about this!
 
     if info_s['Software'] != 'Mixminion %s'%mixminion.__version__:
-        warn("Published version (%s) does not match current version (%s)",
-             info_s['Software'], 'Mixminion %s'%mixminion.__version__)
+        warn("Mismatched software versions: running %s; %s published."
+             'Mixminion %s'%mixminion.__version__, info_s['Software'])
 
     info_im = info['Incoming/MMTP']
     config_im = config['Incoming/MMTP']
@@ -748,11 +748,11 @@
     info_ip = info['Incoming/MMTP']['IP']
     if config_im['IP'] == '0.0.0.0':
         guessed = _guessLocalIP()
-        if guessed != config_im['IP']:
-            warn("Guessed IP (%s) does not match published IP (%s)",
+        if guessed != info_ip:
+            warn("Mismatched IPs: Guessed IP (%s); %s published.",
                  guessed, info_ip)
     elif config_im['IP'] != info_ip:
-        warn("Configured IP (%s) does not match published IP (%s)",
+        warn("Mismatched IPs: %s configured; %s published.",
              config_im['IP'], info_ip)
 
     if config_im['Enabled'] and not info_im.get('Version'):