[minion-cvs] Don"t scrub out bad queue metadata on startup: we don"t...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientUtils.py 
Log Message:
Don't scrub out bad queue metadata on startup: we don't hold a lock then,
and we can sometimes step all over ourselves.  (Bug reported by qumqats)


Index: ClientUtils.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientUtils.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ClientUtils.py	3 Dec 2003 23:12:00 -0000	1.13
+++ ClientUtils.py	18 Dec 2003 22:59:47 -0000	1.14
@@ -666,7 +666,7 @@
                 os.rename(fname_old, fname_new)
 
         self.store = mixminion.Filestore.ObjectMetadataStore(
-            directory, create=1, scrub=1)
+            directory, create=1)
 
         self.metadataLoaded = 0
 
@@ -765,6 +765,7 @@
             for h in remove:
                 self.store.removeMessage(h)
         self.store.cleanQueue()
+        self.store.cleanMetadata()
 
     def loadMetadata(self):
         """Ensure that we've loaded metadata for this queue from disk."""