[Nym3-commit] r502 - trunk/nymbaron/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2006-03-21 17:13:25 +0100 (Tue, 21 Mar 2006)
New Revision: 502

Modified:
   trunk/nymbaron/Server/User.py
Log:
Fix the nuke() method

Modified: trunk/nymbaron/Server/User.py
===================================================================
--- trunk/nymbaron/Server/User.py	2006-03-21 16:00:29 UTC (rev 501)
+++ trunk/nymbaron/Server/User.py	2006-03-21 16:13:25 UTC (rev 502)
@@ -240,11 +240,13 @@
 
     def nuke(self):
         """Delete a user account."""
-        os.unlink(self.mboxfile())
-        os.unlink(self.synboxfile())
-        os.unlink(self.indexfile())
-        os.unlink(self.surbfile())
-        os.unlink(self.datafile)
+        for f in [self.mboxfile(), self.synboxfile(), self.indexfile(), \
+                  self.surbfile(), self.datafile]:
+            try:
+                os.unlink(f)
+            except OSError:
+                pass
+        self.abort()
 
     def timecmp(self, a, b):
         return cmp(self.index[a]['time'], self.index[b]['time'])