From: Robin H. Johnson <robbat2@gentoo.org>
Date: Mon, 22 Apr 2013 23:08:51 +0000 (+0000)
Subject: Add preliminary DCO_SIGNED_OFF_BY support for DCO Signed-off-by footer.
X-Git-Tag: v2.2.0_alpha174~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1243da9e15540733447821ef31ed9a8330a1e22c;p=portage.git

Add preliminary DCO_SIGNED_OFF_BY support for DCO Signed-off-by footer.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/bin/repoman b/bin/repoman
index c419c6fdc..ca4aa0ae8 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 0b4dc39a2..481ce693d 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",