From e8ef39e89dabf2f9ebc578fcb97a3f157e07ec34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 11 Jul 2010 12:53:20 +0200 Subject: Make the commitmessage append clearer. Put an empty line between the real commit message and Portage version append. Instead of creating a second pair of parenthesis for the Manifest commit one, append it to the Portage version. --- bin/repoman | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 750bc6664..f14dc4533 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2270,7 +2270,7 @@ else: unameout += platform.processor() else: unameout += platform.machine() - commitmessage += "\n(Portage version: %s/%s/%s" % \ + commitmessage += "\n\n(Portage version: %s/%s/%s" % \ (portage_version, vcs, unameout) if options.force: commitmessage += ", RepoMan options: --force" @@ -2525,11 +2525,12 @@ else: fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") mymsg = os.fdopen(fd, "w") - mymsg.write(commitmessage) + # strip the closing parenthesis + mymsg.write(commitmessage[:-1]) if signed: - mymsg.write("\n (Signed Manifest commit)") + mymsg.write(", signed Manifest commit)") else: - mymsg.write("\n (Unsigned Manifest commit)") + mymsg.write(", unsigned Manifest commit)") mymsg.close() commit_cmd = [] -- cgit v1.2.3-1-g7c22