[minion-cvs] Make server-republish work correctly

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerKeys.py ServerMain.py 
Log Message:
Make server-republish work correctly

Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ServerKeys.py	28 May 2003 07:42:22 -0000	1.28
+++ ServerKeys.py	28 May 2003 08:41:04 -0000	1.29
@@ -207,7 +207,7 @@
         for ks in keySets:
             status = ks.publish(DIRECTORY_UPLOAD_URL)
             if status == 'error':
-                LOG.info("Error publishing a key; giving up")
+                LOG.error("Error publishing a key; giving up")
                 return 0
             elif status == 'reject':
                 rejected += 1

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ServerMain.py	28 May 2003 07:36:24 -0000	1.60
+++ ServerMain.py	28 May 2003 08:41:04 -0000	1.61
@@ -1215,7 +1215,7 @@
         if not fn.startswith("key_"):
             continue
         num = fn[4:]
-        publishedFile = os.path.join(keydir, "fn", "published")
+        publishedFile = os.path.join(keydir, fn, "published")
         try:
             LOG.info("Marking key %s unpublished", num)
             if os.path.exists(publishedFile):