Attachment #597140 for bug #667432

Lines 152-158 environ_filter += [ Link Here

(-)a/lib/portage/package/ebuild/_config/special_env_vars.py (-1 / +1 lines)
152	"BINPKG_COMPRESS", "BINPKG_COMPRESS_FLAGS",	152	"BINPKG_COMPRESS", "BINPKG_COMPRESS_FLAGS",
153	"CLEAN_DELAY", "COLLISION_IGNORE",	153	"CLEAN_DELAY", "COLLISION_IGNORE",
154	"CONFIG_PROTECT", "CONFIG_PROTECT_MASK",	154	"CONFIG_PROTECT", "CONFIG_PROTECT_MASK",
155	"DCO_SIGNED_OFF_BY",
156	"EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS",	155	"EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS",
157	"EMERGE_LOG_DIR",	156	"EMERGE_LOG_DIR",
158	"EMERGE_WARNING_DELAY",	157	"EMERGE_WARNING_DELAY",
Lines 182-187 environ_filter += [ Link Here
182	"RESUMECOMMAND", "RESUMECOMMAND_FTP",	181	"RESUMECOMMAND", "RESUMECOMMAND_FTP",
183	"RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS",	182	"RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS",
184	"RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP",	183	"RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP",
		184	"SIGNED_OFF_BY",
185	"UNINSTALL_IGNORE", "USE_EXPAND_HIDDEN", "USE_ORDER",	185	"UNINSTALL_IGNORE", "USE_EXPAND_HIDDEN", "USE_ORDER",
186	"__PORTAGE_HELPER"	186	"__PORTAGE_HELPER"
187	]	187	]

Lines 157-163 class config(object): Link Here

(-)a/lib/portage/package/ebuild/config.py (-1 / +2 lines)
157	'PORTAGE_PYM_PATH', 'PORTAGE_PYTHONPATH'])	157	'PORTAGE_PYM_PATH', 'PORTAGE_PYTHONPATH'])
158		158
159	_deprecated_keys = {'PORTAGE_LOGDIR': 'PORT_LOGDIR',	159	_deprecated_keys = {'PORTAGE_LOGDIR': 'PORT_LOGDIR',
160	'PORTAGE_LOGDIR_CLEAN': 'PORT_LOGDIR_CLEAN'}	160	'PORTAGE_LOGDIR_CLEAN': 'PORT_LOGDIR_CLEAN',
		161	'SIGNED_OFF_BY': 'DCO_SIGNED_OFF_BY'}
161		162
162	_setcpv_aux_keys = ('BDEPEND', 'DEFINED_PHASES', 'DEPEND', 'EAPI', 'HDEPEND',	163	_setcpv_aux_keys = ('BDEPEND', 'DEFINED_PHASES', 'DEPEND', 'EAPI', 'HDEPEND',
163	'INHERITED', 'IUSE', 'REQUIRED_USE', 'KEYWORDS', 'LICENSE', 'PDEPEND',	164	'INHERITED', 'IUSE', 'REQUIRED_USE', 'KEYWORDS', 'LICENSE', 'PDEPEND',




.TH "MAKE.CONF" "5" "Nov 2019" "Portage VERSION" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"

as \fI\-\-target=${CTARGET}\fR only if it is defined.
.TP
.B DCO_SIGNED_OFF_BY
See \fISIGNED_OFF_BY\fR below.  Deprecated.
\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
.TP
\fBDISTDIR\fR = \fI[path]\fR
Defines the location of your local source file repository. After packages

.br
Defaults to /var/cache/rpm.
.TP
.B SIGNED_OFF_BY
This variable may contain a name and email address which will be used by
\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
The meaning of a signoff depends on the project.  Typically, it certifies
that the committer has the rights to submit the work under a free license
and agrees to a Certificate of Origin.  (For example, see GLEP 76 for the
Gentoo Linux policy: \fIhttps://www.gentoo.org/glep/glep-0076.html\fR.)
.TP
\fBSYNC\fR = \fI[RSYNC]\fR
Insert your preferred rsync mirror here.  This rsync server
is used to sync the local ebuild repository when `emerge \-\-sync` is run.

Lines 1-4 Link Here

(-)a/repoman/lib/repoman/actions.py (-4 / +5 lines)
1	# -- coding:utf-8 --	1	# -- coding:utf-8 --
		2	# Copyright 1999-2019 Gentoo Authors
		3	# Distributed under the terms of the GNU General Public License v2
2		4
3	from __future__ import print_function, unicode_literals	5	from __future__ import print_function, unicode_literals
4		6
Lines 402-408 the whole commit message to abort. Link Here
402	def get_commit_footer(self):	404	def get_commit_footer(self):
403	portage_version = getattr(portage, "VERSION", None)	405	portage_version = getattr(portage, "VERSION", None)
404	gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "")	406	gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "")
405	dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "")	407	signoff = self.repoman_settings.get("SIGNED_OFF_BY", "")
406	report_options = []	408	report_options = []
407	if self.options.force:	409	if self.options.force:
408	report_options.append("--force")	410	report_options.append("--force")
Lines 470-477 the whole commit message to abort. Link Here
470	commit_footer += ", unsigned Manifest commit"	472	commit_footer += ", unsigned Manifest commit"
471	commit_footer += ")"	473	commit_footer += ")"
472		474
473	if dco_sob:	475	if signoff:
474	commit_footer += "\nSigned-off-by: %s" % (dco_sob, )	476	commit_footer += "\nSigned-off-by: %s" % (signoff, )
475		477
476	return commit_footer	478	return commit_footer
477		479
478	-

Return to bug 667432

Lines 1-4 Link Here

(-)a/man/make.conf.5 (-3 / +10 lines)
1	.TH "MAKE.CONF" "5" "Jul 2019" "Portage VERSION" "Portage"	1	.TH "MAKE.CONF" "5" "Nov 2019" "Portage VERSION" "Portage"
2	.SH "NAME"	2	.SH "NAME"
3	make.conf \- custom settings for Portage	3	make.conf \- custom settings for Portage
4	.SH "SYNOPSIS"	4	.SH "SYNOPSIS"
Lines 205-212 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR Link Here
205	as \fI\-\-target=${CTARGET}\fR only if it is defined.	205	as \fI\-\-target=${CTARGET}\fR only if it is defined.
206	.TP	206	.TP
207	.B DCO_SIGNED_OFF_BY	207	.B DCO_SIGNED_OFF_BY
208	This variable may contain a name and email address which will be used by	208	See \fISIGNED_OFF_BY\fR below. Deprecated.
209	\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
210	.TP	209	.TP
211	\fBDISTDIR\fR = \fI[path]\fR	210	\fBDISTDIR\fR = \fI[path]\fR
212	Defines the location of your local source file repository. After packages	211	Defines the location of your local source file repository. After packages
Lines 1141-1146 Defines the location where created RPM packages will be stored. Link Here
1141	.br	1140	.br
1142	Defaults to /var/cache/rpm.	1141	Defaults to /var/cache/rpm.
1143	.TP	1142	.TP
		1143	.B SIGNED_OFF_BY
		1144	This variable may contain a name and email address which will be used by
		1145	\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
		1146	The meaning of a signoff depends on the project. Typically, it certifies
		1147	that the committer has the rights to submit the work under a free license
		1148	and agrees to a Certificate of Origin. (For example, see GLEP 76 for the
		1149	Gentoo Linux policy: \fIhttps://www.gentoo.org/glep/glep-0076.html\fR.)
		1150	.TP
1144	\fBSYNC\fR = \fI[RSYNC]\fR	1151	\fBSYNC\fR = \fI[RSYNC]\fR
1145	Insert your preferred rsync mirror here. This rsync server	1152	Insert your preferred rsync mirror here. This rsync server
1146	is used to sync the local ebuild repository when `emerge \-\-sync` is run.	1153	is used to sync the local ebuild repository when `emerge \-\-sync` is run.