From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73E4A15808B for ; Wed, 9 Feb 2022 10:50:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 887C2E082B; Wed, 9 Feb 2022 10:50:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0600E082B for ; Wed, 9 Feb 2022 10:50:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 938B53406DD for ; Wed, 9 Feb 2022 10:50:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BAFD2B2 for ; Wed, 9 Feb 2022 10:50:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644403784.0064df828104e2fda3b552c02c56f1ef1fb9c613.sam@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: bin/, pym/gentoolkit/ekeyword/, man/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/ebump man/ebump.1 pym/gentoolkit/ekeyword/ekeyword.py X-VCS-Directories: man/ pym/gentoolkit/ekeyword/ bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0064df828104e2fda3b552c02c56f1ef1fb9c613 X-VCS-Branch: master Date: Wed, 9 Feb 2022 10:50:37 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1040b25f-4415-4b2a-a2d8-c21bd52ea04d X-Archives-Hash: dcd19d7b0c256f60e3dba9d97d76d46b commit: 0064df828104e2fda3b552c02c56f1ef1fb9c613 Author: Sam James gentoo org> AuthorDate: Tue Dec 14 05:19:37 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 9 10:49:44 2022 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=0064df82 */*: drop obsolete Changelog references We got rid of Changelogs years ago in ::gentoo and most Portage support is gone too. Closes: https://bugs.gentoo.org/832369 Signed-off-by: Sam James gentoo.org> bin/ebump | 35 ----------------------------------- man/ebump.1 | 29 +---------------------------- pym/gentoolkit/ekeyword/ekeyword.py | 7 +------ 3 files changed, 2 insertions(+), 69 deletions(-) diff --git a/bin/ebump b/bin/ebump index a0d4d56..7f6e3ce 100755 --- a/bin/ebump +++ b/bin/ebump @@ -39,9 +39,7 @@ print_usage() { echo " -v|--verbose increase verbosity" echo " -q|--quiet turn off output" echo " -a|--no-auxfiles don't bump auxfiles (files/*)" - echo " -c|--no-changelog do not update ChangeLog (via echangelog)" echo " -C|--no-vcs do not add to VCS" - echo " -m|--message append message to ChangeLog" echo " -d|--delete-old delete previous revision from VCS (DANGEROUS!)" } @@ -55,17 +53,9 @@ load_options() { if [ -f "/etc/gentoolkit/ebump.conf" ] ; then . /etc/gentoolkit/ebump.conf fi - if [ -f "${HOME}/.gentoo/gentool-env" ] ; then - . ${HOME}/.gentoo/gentool-env - fi if [ -f "${HOME}/.gentoo/ebump.conf" ] ; then . ${HOME}/.gentoo/ebump.conf fi - - # FIXME: remove this warning in 2-3 releases. - if [ -n "${opt_add_cvs}" ]; then - echo "Warning: opt_add_cvs is deprecated, please use opt_add_vcs from now on!" >&2 - fi } # @@ -276,26 +266,6 @@ process_ebuild() { fi einfo "Removed ${delfiles} from VCS" fi - - # - # (Optional) Add ChangeLog entry - # - if [ "${opt_add_changelog}" = "y" ] && [ "${opt_add_vcs}" = "y" ]; then - # FIXME: remove this warning in 2-3 releases - if [ -n "${AUTHORNAME}" ] || [ -n "${AUTHOREMAIL}" ]; then - echo "Warning: AUTHORNAME and AUTHOREMAIL is deprecated!" >&2 - echo "Please take a look at echangelog(1)." >&2 - echo "To avoid this warning unset AUTHORNAME and AUTHOREMAIL." >&2 - fi - - echangelog "${opt_commitmessage}" || set $? - - if [ ${1:-0} -ne 0 ]; then - einfo "Modifying ChangeLog failed!" - else - einfo "Added ChangeLog entry" - fi - fi } get_vcs() { @@ -322,7 +292,6 @@ get_vcs() { # Global options # opt_verbosity=0 -opt_add_changelog=y opt_add_vcs=y opt_bump_auxfiles=y opt_delete_old=n @@ -348,10 +317,6 @@ while [ ${#} -gt 0 ] ; do opt_bump_auxfiles=n continue ;; - -c|--no-changelog) - opt_add_changelog=n - continue - ;; -C|--no-vcs) opt_add_vcs=n continue diff --git a/man/ebump.1 b/man/ebump.1 index 1754cf9..72c0d05 100644 --- a/man/ebump.1 +++ b/man/ebump.1 @@ -54,21 +54,6 @@ Do not output any non-essential information. .IP don't bump auxfiles (files/*) -.LP -\fB\-c\fR -.br -\fB--no-changelog\fB -.IP -do not update ChangeLog (via echangelog) - -.LP -\fB\-m\fR <\fIChangeLog text\fR> -.br -\fB\--message\fR <\fIChangeLog text\fR> -.IP -Specifies the message to add to the ChangeLog, instead of the standard -placeholder. - .LP \fB\-d\fR .br @@ -96,28 +81,16 @@ From these files, \fIebump\fR will load the settings .br \fBopt_verbosity\fR (default \fI1\fR) - verbosity level 0-10 .br -\fBopt_add_changelog\fR (default \fIy\fR) - add entry in ChangeLog -.br \fBopt_add_vcs\fR (default \fIy\fR) - add new files to VCS .br \fBopt_bump_auxfiles\fR (default \fIy\fR) - bump auxiliary files in files/ .br \fBopt_delete_old\fR (default \fIn\fR) - delete old revision (DANGEROUS!) -.br -\fBopt_commitmessage\fR (default \fI""\fR) - default ChangeLog message - -.LP -\fB(DEPRECATED)\fR -.br -\fB~/.gentoo/gentool-env\fR -.IR -From this file, \fIebump\fR will load the env vars \fBAUTHORNAME\fR and -\fBAUTHOREMAIL\fR, which are used to generate proper ChangeLog entries. .SH "SEE ALSO" .LP The rest of the utilities in \fIapp-portage/gentoolkit-dev\fR, such as -\fIechangelog(1)\fR and \fIekeyword(1)\fR. +\fIekeyword(1)\fR. .SH "AUTHORS" .LP diff --git a/pym/gentoolkit/ekeyword/ekeyword.py b/pym/gentoolkit/ekeyword/ekeyword.py index 13b93ad..7d3a1ef 100755 --- a/pym/gentoolkit/ekeyword/ekeyword.py +++ b/pym/gentoolkit/ekeyword/ekeyword.py @@ -415,12 +415,7 @@ def ignorable_arg(arg, quiet=0): "metadata.xml", ) base = os.path.basename(arg) - if ( - base.startswith("ChangeLog") - or base in WHITELIST - or base.startswith(".") - or base.endswith("~") - ): + if base in WHITELIST or base.startswith(".") or base.endswith("~"): if not quiet: warning("ignoring file: %s" % arg) return True