[minion-cvs] Use more readable values for the Configuration entry in...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerConfig.py 
Log Message:
Use more readable values for the Configuration entry in SDs

Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ServerConfig.py	8 Dec 2003 02:26:39 -0000	1.45
+++ ServerConfig.py	7 Jan 2004 20:46:04 -0000	1.46
@@ -161,16 +161,17 @@
              ['Enabled', 'Retry', 'SMTPServer', 'ReturnAddress', 'FromTag',
               'SubjectLine', 'MaximumSize']),
             ("Delivery/SMTP-Via-Mixmaster",
-             ['Enabled', 'Retry', 'Server', 'ReturnAddress', 'FromTag',
+             ['Enabled', 'Retry', 'Server', 'FromTag',
               'SubjectLine', 'MaximumSize']),
             ("Delivery/Fragmented",
              ['Enabled', 'MaximumSize','MaximumInterval']),
             ]:
-            sec = self[section]
             for k in entries:
-                v = sec.get(k, None)
-                if v:
-                    res.append("%s/%s=%r"%(section,k,v))
+                ent = self[section].get(k,None)
+                if ent is None:
+                    continue
+                v = self.getFeature(section, k)
+                res.append("%s/%s=%r"%(section,k,v))
         return "; ".join(res)
 
     def validateRetrySchedule(self, sectionName, entryName='Retry'):