[Nym3-commit] r411 - trunk/nymbaron/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-11-16 21:22:21 +0100 (Wed, 16 Nov 2005)
New Revision: 411

Modified:
   trunk/nymbaron/Client/Account.py
Log:
- Fix a deletion bug


Modified: trunk/nymbaron/Client/Account.py
===================================================================
--- trunk/nymbaron/Client/Account.py	2005-11-16 19:48:33 UTC (rev 410)
+++ trunk/nymbaron/Client/Account.py	2005-11-16 20:22:21 UTC (rev 411)
@@ -199,7 +199,15 @@
 	if create:
 	    self.data = {}
 	    self.succeeded = False
-	    self.idTag = self.tagmap.getnewId(nickname)
+	    try:
+		self.idTag = self.tagmap.getnewId(nickname)
+	    except AlreadySuchAccount:
+		self.succeeded = True #don't erase the existing account
+		self.data_status = 'unloaded'
+		self.journal_status = 'unloaded'
+		self.mbox_status = 'unloaded'
+		self.synbox_status = 'unloaded'
+		raise
 	    self._lock()
 	    # If the nick already existed, we're out of this because of
 	    # a thrown AlreadySuchAccount.