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 902641381F3 for ; Tue, 23 Apr 2013 03:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23A82E0904; Tue, 23 Apr 2013 03:20:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87368E0904 for ; Tue, 23 Apr 2013 03:20:54 +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 9CB8033DBF2 for ; Tue, 23 Apr 2013 03:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 43942E43F5 for ; Tue, 23 Apr 2013 03:20:52 +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: <1366686089.1243da9e15540733447821ef31ed9a8330a1e22c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/portage/package/ebuild/_config/special_env_vars.py X-VCS-Directories: pym/portage/package/ebuild/_config/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1243da9e15540733447821ef31ed9a8330a1e22c X-VCS-Branch: master Date: Tue, 23 Apr 2013 03:20:52 +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: e71de2e7-0c6f-439b-bf6c-d888565ad705 X-Archives-Hash: 27034ee1042f5dfc4179500f1c735908 commit: 1243da9e15540733447821ef31ed9a8330a1e22c Author: Robin H. Johnson gentoo org> AuthorDate: Mon Apr 22 23:08:51 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 23 03:01:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1243da9e Add preliminary DCO_SIGNED_OFF_BY support for DCO Signed-off-by footer. Signed-off-by: Robin H. Johnson gentoo.org> --- bin/repoman | 8 +++++++- .../package/ebuild/_config/special_env_vars.py | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index c419c6f..ca4aa0a 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2659,6 +2659,7 @@ else: changelog_msg = commitmessage portage_version = getattr(portage, "VERSION", None) gpg_key = repoman_settings.get("PORTAGE_GPG_KEY", "") + dco_sob = repoman_settings.get("DCO_SIGNED_OFF_BY", "") if portage_version is None: sys.stderr.write("Failed to insert portage version in message!\n") sys.stderr.flush() @@ -2671,13 +2672,18 @@ else: commit_footer += "\nRepoMan-Options: --force" if sign_manifests: commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, ) + if dco_sob: + commit_footer += "\nSigned-off-by: %s" % (dco_sob, ) else: 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" % \ + commit_footer = "\n\n" + if dco_sob: + commit_footer += "Signed-off-by: %s\n" % (dco_sob, ) + commit_footer += "(Portage version: %s/%s/%s" % \ (portage_version, vcs, unameout) if options.force: commit_footer += ", RepoMan options: --force" diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index 0b4dc39..481ce69 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -147,6 +147,7 @@ environ_filter += [ "ACCEPT_CHOSTS", "ACCEPT_KEYWORDS", "ACCEPT_PROPERTIES", "AUTOCLEAN", "CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", + "DCO_SIGNED_OFF_BY", "EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS", "EMERGE_LOG_DIR", "EMERGE_WARNING_DELAY",