diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:25:40 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-14 12:25:40 -0700 |
| commit | 8651a9e838e4028e74e115f26e263639c1835173 (patch) | |
| tree | 442d6c12c688820e2053a5647cb06ac00353d295 /bin | |
| parent | 6210ad8a7ecafcb8a616f28dc3447c219f0d134f (diff) | |
| download | portage-8651a9e838e4028e74e115f26e263639c1835173.tar.gz portage-8651a9e838e4028e74e115f26e263639c1835173.tar.bz2 portage-8651a9e838e4028e74e115f26e263639c1835173.zip | |
Revert "repoman: identical Manifest commit message"
This reverts commit b91eefc82e995ba3463d212f95fa9228c5cf53ae.
See bug #437546, comment #3.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman index 8dd85d011..ecf1bd251 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2859,7 +2859,14 @@ else: fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") mymsg = os.fdopen(fd, "wb") - mymsg.write(_unicode_encode(commitmessage)) + # 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.close() commit_cmd = [] |