[Nym3-commit] r248 - trunk/nym3/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-05-07 15:28:33 +0200 (Sat, 07 May 2005)
New Revision: 248

Modified:
   trunk/nym3/Server/User.py
Log:
Bugfix (triggered by DELETE command).


Modified: trunk/nym3/Server/User.py
===================================================================
--- trunk/nym3/Server/User.py	2005-05-07 12:13:03 UTC (rev 247)
+++ trunk/nym3/Server/User.py	2005-05-07 13:28:33 UTC (rev 248)
@@ -438,20 +438,21 @@
 
 	if not self.index.has_key(mid): return
 	self.load_mbox()
-	del self.mbox[mid]
+	if self.mbox.has_key(mid): del self.mbox[mid]
 	self.index[mid]['status'] = lifeCycle['deleted']
 	self.load_synbox()
 
-	i, (sl, enc, blurb) = self.getSyn(mid)
+	try:
+	    i, (sl, enc, blurb) = self.getSyn(mid)
+	except ValueError: return
 	candelete = True
 	for omid in sl:
 	    if not self.index[omid]['status'] == lifeCycle['deleted']:
 		candelete = False
 		break
-	    if candelete:
-		self.syn.remove((sl, enc, blurb))
-		for omid in sl: del self.index[omid]
-	    else: return
+	if candelete:
+	    del self.syn[i]
+	    for omid in sl: del self.index[omid]
 
     def setKeys(self, kid, kenc):
         """Set the identity and encryption key of the user, ASN.1 encoded"""