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 7D8AA138010 for ; Sun, 14 Oct 2012 20:17:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC81AE0417; Sun, 14 Oct 2012 20:17:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5E206E0417 for ; Sun, 14 Oct 2012 20:17:08 +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 C0F1133D799 for ; Sun, 14 Oct 2012 20:17:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 60A13E5436 for ; Sun, 14 Oct 2012 20:17:06 +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: <1350245805.e3edc37982a4a0c89db5d4b28b58de77cea1bcf2.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: e3edc37982a4a0c89db5d4b28b58de77cea1bcf2 X-VCS-Branch: master Date: Sun, 14 Oct 2012 20:17:06 +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: d925091e-84dd-4e7d-a0ba-741be5424199 X-Archives-Hash: 9b71a51ae65289b911250b619ca6b0d6 commit: e3edc37982a4a0c89db5d4b28b58de77cea1bcf2 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 14 20:16:21 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 14 20:16:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3edc379 repoman: special git commit footer, bug #438364 --- bin/repoman | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/bin/repoman b/bin/repoman index edd7649..40ff097 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2524,21 +2524,33 @@ else: sys.stderr.write("Failed to insert portage version in message!\n") sys.stderr.flush() portage_version = "Unknown" - unameout = platform.system() + " " - if platform.system() in ["Darwin", "SunOS"]: - unameout += platform.processor() - else: - unameout += platform.machine() - commitmessage += "\n\n(Portage version: %s/%s/%s" % \ - (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"] + + if vcs == "git": + # Use new footer only for git (see bug #438364). + commit_footer = "\n\nPackage-manager: portage-%s" % portage_version + if options.force: + commit_footer += "\nRepoMan-options: --force" + if sign_manifests: + commit_footer += "\nManifest-sign-key: %s" % \ + repoman_settings.get("PORTAGE_GPG_KEY", "") else: - commitmessage += ", unsigned Manifest commit" - commitmessage += ")" + unameout = platform.system() + " " + if platform.system() in ["Darwin", "SunOS"]: + unameout += platform.processor() + else: + unameout += platform.machine() + commit_footer += "\n\n(Portage version: %s/%s/%s" % \ + (portage_version, vcs, unameout) + if options.force: + commit_footer += ", RepoMan options: --force" + if sign_manifests: + commit_footer += ", signed Manifest commit with key %s" % \ + repoman_settings.get("PORTAGE_GPG_KEY", "") + else: + commit_footer += ", unsigned Manifest commit" + commit_footer += ")" + + commitmessage += commit_footer if options.echangelog in ('y', 'force'): logging.info("checking for unmodified ChangeLog files")