From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Feb 2007 12:48:25 +0000 (-0000)
Subject: Fix more broken commitmessagefile handling.
X-Git-Tag: v2.2_pre1~1666
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b252a04261a0c221ba73cb60254c015131633d34;p=portage.git

Fix more broken commitmessagefile handling.

svn path=/main/trunk/; revision=6033
---

diff --git a/bin/repoman b/bin/repoman
index d5218e071..b599f9111 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1697,13 +1697,18 @@ else:
 		# Force an unsigned commit when more than one Manifest needs to be signed.
 		if repolevel < 3 and "sign" in repoman_settings.features:
 			if "--pretend" in myoptions:
-				print "(/usr/bin/cvs -q commit -F "+commitmessagefile+")"
+				print "(/usr/bin/cvs -q commit -F commitmessagefile)"
 			else:
-				mymsg=open(commitmessagefile,"w")
+				fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
+				mymsg = os.fdopen(fd, "w")
 				mymsg.write(commitmessage)
 				mymsg.write("\n (Unsigned Manifest commit)")
 				mymsg.close()
 				retval=os.system("/usr/bin/cvs -q commit -F "+commitmessagefile)
+				try:
+					os.unlink(commitmessagefile)
+				except OSError:
+					pass
 				if retval:
 					print "!!! Exiting on cvs (shell) error code:",retval
 					sys.exit(retval)