From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 64BBF138010 for ; Sun, 14 Oct 2012 19:26:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54B78E02F0; Sun, 14 Oct 2012 19:26:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE945E02F0 for ; Sun, 14 Oct 2012 19:26:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4904333D726 for ; Sun, 14 Oct 2012 19:26:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E5C40E5436 for ; Sun, 14 Oct 2012 19:26:28 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1350242740.8651a9e838e4028e74e115f26e263639c1835173.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8651a9e838e4028e74e115f26e263639c1835173 X-VCS-Branch: master Date: Sun, 14 Oct 2012 19:26:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cfda5f91-7a5e-4057-baa9-7f5ddd91bb88 X-Archives-Hash: 8e3d58e97572c5a8bba2f65d08afb120 commit: 8651a9e838e4028e74e115f26e263639c1835173 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 14 19:25:40 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 14 19:25:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8651a9e8 Revert "repoman: identical Manifest commit message" This reverts commit b91eefc82e995ba3463d212f95fa9228c5cf53ae. See bug #437546, comment #3. --- bin/repoman | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index 8dd85d0..ecf1bd2 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 = []