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

[laurent at conuropsis.org]

Author: laurent
Date: 2005-10-20 13:20:02 +0200 (Thu, 20 Oct 2005)
New Revision: 365

Modified:
   trunk/nymbaron/Client/Account.py
   trunk/nymbaron/Client/Main.py
Log:
Clean some tempfile created on execution.


Modified: trunk/nymbaron/Client/Account.py
===================================================================
--- trunk/nymbaron/Client/Account.py	2005-10-20 11:09:40 UTC (rev 364)
+++ trunk/nymbaron/Client/Account.py	2005-10-20 11:20:02 UTC (rev 365)
@@ -262,9 +262,9 @@
 	mixcall = "mixminion send -t %s -i %s" % \
 		  (self['servername'], msgpath)
 	os.system(mixcall)
-	# TODO : debugging cruft
-	#os.unlink(msgpath)
-	print "Raw control message left in " + msgpath
+	if not self.config.DEBUG:
+	    os.unlink(msgpath)
+	else: print "Raw control message left in " + msgpath
 
     def mboxfile(self):
 	"""Gets the path of the mailbox"""

Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-10-20 11:09:40 UTC (rev 364)
+++ trunk/nymbaron/Client/Main.py	2005-10-20 11:20:02 UTC (rev 365)
@@ -997,12 +997,15 @@
 	os.close(fd)
 	pp = ui.prompthidden("Please enter your mixminion passphrase")
 	(fdo, nameo) = tempfile.mkstemp()
+	os.close(fdo)
 	id = minion_decode(name, nameo, pp)
+	os.unlink(name)
 	tm = Account.TagMap(config.path + os.sep + 'tagmap')
 	nick = tm.nickFromId(id)
 	decf = open(nameo, "r")
 	decmsg = decf.read()
 	decf.close()
+	os.unlink(nameo)
 	#TODO if the message is not empty
 	#we remove the first character of the message which is a '\n'
 	#this character is added by mixminion to separate the message body