diff options
| author | Michał Górny <gentoo@mgorny.alt.pl> | 2010-07-11 12:53:20 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-11 11:27:32 -0700 |
| commit | e8ef39e89dabf2f9ebc578fcb97a3f157e07ec34 (patch) | |
| tree | 33a48e5642d1c8116e03420fa963efe1526a4559 | |
| parent | bc82a8eaaf99fb0ada2a9fd2cd3c082113d4690c (diff) | |
| download | portage-e8ef39e89dabf2f9ebc578fcb97a3f157e07ec34.tar.gz portage-e8ef39e89dabf2f9ebc578fcb97a3f157e07ec34.tar.bz2 portage-e8ef39e89dabf2f9ebc578fcb97a3f157e07ec34.zip | |
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.
| -rwxr-xr-x | bin/repoman | 9 |
1 files changed, 5 insertions, 4 deletions
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 = [] |