1 |
commit: 0064df828104e2fda3b552c02c56f1ef1fb9c613 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 14 05:19:37 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 9 10:49:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0064df82 |
7 |
|
8 |
*/*: drop obsolete Changelog references |
9 |
|
10 |
We got rid of Changelogs years ago in ::gentoo and most Portage |
11 |
support is gone too. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/832369 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
bin/ebump | 35 ----------------------------------- |
17 |
man/ebump.1 | 29 +---------------------------- |
18 |
pym/gentoolkit/ekeyword/ekeyword.py | 7 +------ |
19 |
3 files changed, 2 insertions(+), 69 deletions(-) |
20 |
|
21 |
diff --git a/bin/ebump b/bin/ebump |
22 |
index a0d4d56..7f6e3ce 100755 |
23 |
--- a/bin/ebump |
24 |
+++ b/bin/ebump |
25 |
@@ -39,9 +39,7 @@ print_usage() { |
26 |
echo " -v|--verbose increase verbosity" |
27 |
echo " -q|--quiet turn off output" |
28 |
echo " -a|--no-auxfiles don't bump auxfiles (files/*)" |
29 |
- echo " -c|--no-changelog do not update ChangeLog (via echangelog)" |
30 |
echo " -C|--no-vcs do not add to VCS" |
31 |
- echo " -m|--message append message to ChangeLog" |
32 |
echo " -d|--delete-old delete previous revision from VCS (DANGEROUS!)" |
33 |
} |
34 |
|
35 |
@@ -55,17 +53,9 @@ load_options() { |
36 |
if [ -f "/etc/gentoolkit/ebump.conf" ] ; then |
37 |
. /etc/gentoolkit/ebump.conf |
38 |
fi |
39 |
- if [ -f "${HOME}/.gentoo/gentool-env" ] ; then |
40 |
- . ${HOME}/.gentoo/gentool-env |
41 |
- fi |
42 |
if [ -f "${HOME}/.gentoo/ebump.conf" ] ; then |
43 |
. ${HOME}/.gentoo/ebump.conf |
44 |
fi |
45 |
- |
46 |
- # FIXME: remove this warning in 2-3 releases. |
47 |
- if [ -n "${opt_add_cvs}" ]; then |
48 |
- echo "Warning: opt_add_cvs is deprecated, please use opt_add_vcs from now on!" >&2 |
49 |
- fi |
50 |
} |
51 |
|
52 |
# |
53 |
@@ -276,26 +266,6 @@ process_ebuild() { |
54 |
fi |
55 |
einfo "Removed ${delfiles} from VCS" |
56 |
fi |
57 |
- |
58 |
- # |
59 |
- # (Optional) Add ChangeLog entry |
60 |
- # |
61 |
- if [ "${opt_add_changelog}" = "y" ] && [ "${opt_add_vcs}" = "y" ]; then |
62 |
- # FIXME: remove this warning in 2-3 releases |
63 |
- if [ -n "${AUTHORNAME}" ] || [ -n "${AUTHOREMAIL}" ]; then |
64 |
- echo "Warning: AUTHORNAME and AUTHOREMAIL is deprecated!" >&2 |
65 |
- echo "Please take a look at echangelog(1)." >&2 |
66 |
- echo "To avoid this warning unset AUTHORNAME and AUTHOREMAIL." >&2 |
67 |
- fi |
68 |
- |
69 |
- echangelog "${opt_commitmessage}" || set $? |
70 |
- |
71 |
- if [ ${1:-0} -ne 0 ]; then |
72 |
- einfo "Modifying ChangeLog failed!" |
73 |
- else |
74 |
- einfo "Added ChangeLog entry" |
75 |
- fi |
76 |
- fi |
77 |
} |
78 |
|
79 |
get_vcs() { |
80 |
@@ -322,7 +292,6 @@ get_vcs() { |
81 |
# Global options |
82 |
# |
83 |
opt_verbosity=0 |
84 |
-opt_add_changelog=y |
85 |
opt_add_vcs=y |
86 |
opt_bump_auxfiles=y |
87 |
opt_delete_old=n |
88 |
@@ -348,10 +317,6 @@ while [ ${#} -gt 0 ] ; do |
89 |
opt_bump_auxfiles=n |
90 |
continue |
91 |
;; |
92 |
- -c|--no-changelog) |
93 |
- opt_add_changelog=n |
94 |
- continue |
95 |
- ;; |
96 |
-C|--no-vcs) |
97 |
opt_add_vcs=n |
98 |
continue |
99 |
|
100 |
diff --git a/man/ebump.1 b/man/ebump.1 |
101 |
index 1754cf9..72c0d05 100644 |
102 |
--- a/man/ebump.1 |
103 |
+++ b/man/ebump.1 |
104 |
@@ -54,21 +54,6 @@ Do not output any non-essential information. |
105 |
.IP |
106 |
don't bump auxfiles (files/*) |
107 |
|
108 |
-.LP |
109 |
-\fB\-c\fR |
110 |
-.br |
111 |
-\fB--no-changelog\fB |
112 |
-.IP |
113 |
-do not update ChangeLog (via echangelog) |
114 |
- |
115 |
-.LP |
116 |
-\fB\-m\fR <\fIChangeLog text\fR> |
117 |
-.br |
118 |
-\fB\--message\fR <\fIChangeLog text\fR> |
119 |
-.IP |
120 |
-Specifies the message to add to the ChangeLog, instead of the standard |
121 |
-placeholder. |
122 |
- |
123 |
.LP |
124 |
\fB\-d\fR |
125 |
.br |
126 |
@@ -96,28 +81,16 @@ From these files, \fIebump\fR will load the settings |
127 |
.br |
128 |
\fBopt_verbosity\fR (default \fI1\fR) - verbosity level 0-10 |
129 |
.br |
130 |
-\fBopt_add_changelog\fR (default \fIy\fR) - add entry in ChangeLog |
131 |
-.br |
132 |
\fBopt_add_vcs\fR (default \fIy\fR) - add new files to VCS |
133 |
.br |
134 |
\fBopt_bump_auxfiles\fR (default \fIy\fR) - bump auxiliary files in files/ |
135 |
.br |
136 |
\fBopt_delete_old\fR (default \fIn\fR) - delete old revision (DANGEROUS!) |
137 |
-.br |
138 |
-\fBopt_commitmessage\fR (default \fI""\fR) - default ChangeLog message |
139 |
- |
140 |
-.LP |
141 |
-\fB(DEPRECATED)\fR |
142 |
-.br |
143 |
-\fB~/.gentoo/gentool-env\fR |
144 |
-.IR |
145 |
-From this file, \fIebump\fR will load the env vars \fBAUTHORNAME\fR and |
146 |
-\fBAUTHOREMAIL\fR, which are used to generate proper ChangeLog entries. |
147 |
|
148 |
.SH "SEE ALSO" |
149 |
.LP |
150 |
The rest of the utilities in \fIapp-portage/gentoolkit-dev\fR, such as |
151 |
-\fIechangelog(1)\fR and \fIekeyword(1)\fR. |
152 |
+\fIekeyword(1)\fR. |
153 |
|
154 |
.SH "AUTHORS" |
155 |
.LP |
156 |
|
157 |
diff --git a/pym/gentoolkit/ekeyword/ekeyword.py b/pym/gentoolkit/ekeyword/ekeyword.py |
158 |
index 13b93ad..7d3a1ef 100755 |
159 |
--- a/pym/gentoolkit/ekeyword/ekeyword.py |
160 |
+++ b/pym/gentoolkit/ekeyword/ekeyword.py |
161 |
@@ -415,12 +415,7 @@ def ignorable_arg(arg, quiet=0): |
162 |
"metadata.xml", |
163 |
) |
164 |
base = os.path.basename(arg) |
165 |
- if ( |
166 |
- base.startswith("ChangeLog") |
167 |
- or base in WHITELIST |
168 |
- or base.startswith(".") |
169 |
- or base.endswith("~") |
170 |
- ): |
171 |
+ if base in WHITELIST or base.startswith(".") or base.endswith("~"): |
172 |
if not quiet: |
173 |
warning("ignoring file: %s" % arg) |
174 |
return True |