| 1 |
commit: 511e00d9f65abea11dfd769baf2ee939e1584ede |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 22 10:19:15 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 26 18:25:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=511e00d9 |
| 7 |
|
| 8 |
Rename DCO_SIGNED_OFF_BY config variable to SIGNED_OFF_BY. |
| 9 |
|
| 10 |
Provide compatibility support for old name. |
| 11 |
Update make.conf.5 man page. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/667432 |
| 14 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/portage/package/ebuild/_config/special_env_vars.py | 2 +- |
| 17 |
lib/portage/package/ebuild/config.py | 3 ++- |
| 18 |
man/make.conf.5 | 13 ++++++++++--- |
| 19 |
repoman/lib/repoman/actions.py | 8 +++++--- |
| 20 |
4 files changed, 18 insertions(+), 8 deletions(-) |
| 21 |
|
| 22 |
diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py |
| 23 |
index e72049e33..50e7a9604 100644 |
| 24 |
--- a/lib/portage/package/ebuild/_config/special_env_vars.py |
| 25 |
+++ b/lib/portage/package/ebuild/_config/special_env_vars.py |
| 26 |
@@ -152,7 +152,6 @@ environ_filter += [ |
| 27 |
"BINPKG_COMPRESS", "BINPKG_COMPRESS_FLAGS", |
| 28 |
"CLEAN_DELAY", "COLLISION_IGNORE", |
| 29 |
"CONFIG_PROTECT", "CONFIG_PROTECT_MASK", |
| 30 |
- "DCO_SIGNED_OFF_BY", |
| 31 |
"EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS", |
| 32 |
"EMERGE_LOG_DIR", |
| 33 |
"EMERGE_WARNING_DELAY", |
| 34 |
@@ -182,6 +181,7 @@ environ_filter += [ |
| 35 |
"RESUMECOMMAND", "RESUMECOMMAND_FTP", |
| 36 |
"RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS", |
| 37 |
"RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP", |
| 38 |
+ "SIGNED_OFF_BY", |
| 39 |
"UNINSTALL_IGNORE", "USE_EXPAND_HIDDEN", "USE_ORDER", |
| 40 |
"__PORTAGE_HELPER" |
| 41 |
] |
| 42 |
|
| 43 |
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py |
| 44 |
index e0dda54d4..6efb5ae86 100644 |
| 45 |
--- a/lib/portage/package/ebuild/config.py |
| 46 |
+++ b/lib/portage/package/ebuild/config.py |
| 47 |
@@ -157,7 +157,8 @@ class config(object): |
| 48 |
'PORTAGE_PYM_PATH', 'PORTAGE_PYTHONPATH']) |
| 49 |
|
| 50 |
_deprecated_keys = {'PORTAGE_LOGDIR': 'PORT_LOGDIR', |
| 51 |
- 'PORTAGE_LOGDIR_CLEAN': 'PORT_LOGDIR_CLEAN'} |
| 52 |
+ 'PORTAGE_LOGDIR_CLEAN': 'PORT_LOGDIR_CLEAN', |
| 53 |
+ 'SIGNED_OFF_BY': 'DCO_SIGNED_OFF_BY'} |
| 54 |
|
| 55 |
_setcpv_aux_keys = ('BDEPEND', 'DEFINED_PHASES', 'DEPEND', 'EAPI', 'HDEPEND', |
| 56 |
'INHERITED', 'IUSE', 'REQUIRED_USE', 'KEYWORDS', 'LICENSE', 'PDEPEND', |
| 57 |
|
| 58 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
| 59 |
index 44d518dbb..78ff8cb06 100644 |
| 60 |
--- a/man/make.conf.5 |
| 61 |
+++ b/man/make.conf.5 |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-.TH "MAKE.CONF" "5" "Jul 2019" "Portage VERSION" "Portage" |
| 64 |
+.TH "MAKE.CONF" "5" "Nov 2019" "Portage VERSION" "Portage" |
| 65 |
.SH "NAME" |
| 66 |
make.conf \- custom settings for Portage |
| 67 |
.SH "SYNOPSIS" |
| 68 |
@@ -205,8 +205,7 @@ This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR |
| 69 |
as \fI\-\-target=${CTARGET}\fR only if it is defined. |
| 70 |
.TP |
| 71 |
.B DCO_SIGNED_OFF_BY |
| 72 |
-This variable may contain a name and email address which will be used by |
| 73 |
-\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message. |
| 74 |
+See \fISIGNED_OFF_BY\fR below. Deprecated. |
| 75 |
.TP |
| 76 |
\fBDISTDIR\fR = \fI[path]\fR |
| 77 |
Defines the location of your local source file repository. After packages |
| 78 |
@@ -1141,6 +1140,14 @@ Defines the location where created RPM packages will be stored. |
| 79 |
.br |
| 80 |
Defaults to /var/cache/rpm. |
| 81 |
.TP |
| 82 |
+.B SIGNED_OFF_BY |
| 83 |
+This variable may contain a name and email address which will be used by |
| 84 |
+\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message. |
| 85 |
+The meaning of a signoff depends on the project. Typically, it certifies |
| 86 |
+that the committer has the rights to submit the work under a free license |
| 87 |
+and agrees to a Certificate of Origin. (For example, see GLEP 76 for the |
| 88 |
+Gentoo Linux policy: \fIhttps://www.gentoo.org/glep/glep-0076.html\fR.) |
| 89 |
+.TP |
| 90 |
\fBSYNC\fR = \fI[RSYNC]\fR |
| 91 |
Insert your preferred rsync mirror here. This rsync server |
| 92 |
is used to sync the local ebuild repository when `emerge \-\-sync` is run. |
| 93 |
|
| 94 |
diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py |
| 95 |
index 92d4d4e94..56a5255bf 100644 |
| 96 |
--- a/repoman/lib/repoman/actions.py |
| 97 |
+++ b/repoman/lib/repoman/actions.py |
| 98 |
@@ -1,4 +1,6 @@ |
| 99 |
# -*- coding:utf-8 -*- |
| 100 |
+# Copyright 1999-2019 Gentoo Authors |
| 101 |
+# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
from __future__ import print_function, unicode_literals |
| 104 |
|
| 105 |
@@ -402,7 +404,7 @@ the whole commit message to abort. |
| 106 |
def get_commit_footer(self): |
| 107 |
portage_version = getattr(portage, "VERSION", None) |
| 108 |
gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "") |
| 109 |
- dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "") |
| 110 |
+ signoff = self.repoman_settings.get("SIGNED_OFF_BY", "") |
| 111 |
report_options = [] |
| 112 |
if self.options.force: |
| 113 |
report_options.append("--force") |
| 114 |
@@ -470,8 +472,8 @@ the whole commit message to abort. |
| 115 |
commit_footer += ", unsigned Manifest commit" |
| 116 |
commit_footer += ")" |
| 117 |
|
| 118 |
- if dco_sob: |
| 119 |
- commit_footer += "\nSigned-off-by: %s" % (dco_sob, ) |
| 120 |
+ if signoff: |
| 121 |
+ commit_footer += "\nSigned-off-by: %s" % (signoff, ) |
| 122 |
|
| 123 |
return commit_footer |
Archives