diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:48:35 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:48:35 -0700 |
commit | 30f3a3fb492bf956d928352037e12d948a8a7a35 (patch) | |
tree | 068784623e07fdb5055588dba3dba07490914023 | |
parent | 8651a9e838e4028e74e115f26e263639c1835173 (diff) | |
download | portage-30f3a3fb492bf956d928352037e12d948a8a7a35.tar.gz portage-30f3a3fb492bf956d928352037e12d948a8a7a35.tar.bz2 portage-30f3a3fb492bf956d928352037e12d948a8a7a35.zip |
repoman: identical Manifest commit message
Include the signed/unsigned part it the initial commit message,
so that it's identical to the Manifest commit message. See
bug #437546, comment #3.
-rwxr-xr-x | bin/repoman | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/repoman b/bin/repoman index ecf1bd251..edd764935 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2533,6 +2533,11 @@ else: (portage_version, vcs, unameout) if options.force: commitmessage += ", RepoMan options: --force" + if sign_manifests: + commitmessage += ", signed Manifest commit with key %s" % \ + repoman_settings["PORTAGE_GPG_KEY"] + else: + commitmessage += ", unsigned Manifest commit" commitmessage += ")" if options.echangelog in ('y', 'force'): @@ -2859,14 +2864,7 @@ else: fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") mymsg = os.fdopen(fd, "wb") - # strip the closing parenthesis - mymsg.write(_unicode_encode(commitmessage[:-1])) - if signed: - mymsg.write(_unicode_encode( - ", signed Manifest commit with key %s)" % \ - repoman_settings["PORTAGE_GPG_KEY"])) - else: - mymsg.write(b", unsigned Manifest commit)") + mymsg.write(_unicode_encode(commitmessage)) mymsg.close() commit_cmd = [] |