summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-22 12:48:25 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-22 12:48:25 +0000
commitb252a04261a0c221ba73cb60254c015131633d34 (patch)
tree23c5dfeb579a6b6cb05b4740f28bf86b0139001b
parent843e95fbafb59f8c0bb1a6449bbb9ae890f96359 (diff)
downloadportage-b252a04261a0c221ba73cb60254c015131633d34.tar.gz
portage-b252a04261a0c221ba73cb60254c015131633d34.tar.bz2
portage-b252a04261a0c221ba73cb60254c015131633d34.zip
Fix more broken commitmessagefile handling.
svn path=/main/trunk/; revision=6033
-rwxr-xr-xbin/repoman9
1 files changed, 7 insertions, 2 deletions
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)