From 30f3a3fb492bf956d928352037e12d948a8a7a35 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 14 Oct 2012 12:48:35 -0700 Subject: [PATCH] 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. --- bin/repoman | 14 ++++++-------- 1 file 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 = [] -- 2.26.2