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 1A355158003 for ; Fri, 19 Nov 2021 23:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A660E07E0; Fri, 19 Nov 2021 23:59:16 +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 8EE3CE07E0 for ; Fri, 19 Nov 2021 23:59:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8ABB6342C50 for ; Fri, 19 Nov 2021 23:59:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBF1C29 for ; Fri, 19 Nov 2021 23:59:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1637366108.47fb9590b57162a786d668f663c1d0dfbfd1cfb0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 47fb9590b57162a786d668f663c1d0dfbfd1cfb0 X-VCS-Branch: master Date: Fri, 19 Nov 2021 23:59:11 +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: 2219744f-f57b-4d1d-aaf6-a0653f77d38e X-Archives-Hash: 3410acff06ac26cd6d6d8b73c6fd5003 commit: 47fb9590b57162a786d668f663c1d0dfbfd1cfb0 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Fri Nov 19 22:00:00 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Nov 19 23:55:08 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=47fb9590 eapply_user(): Add message about applying user patches and minor decoration. Bug: https://bugs.gentoo.org/825066 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Zac Medico gentoo.org> bin/phase-helpers.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 94f4f24f2..6a078caad 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -1139,6 +1139,10 @@ if ___eapi_has_eapply_user; then local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches + local columns=${COLUMNS:-0} + [[ ${columns} == 0 ]] && columns=$(set -- $( ( stty size /dev/null || echo 24 80 ) ; echo $2) + (( columns > 0 )) || (( columns = 80 )) + local applied d f local -A _eapply_user_patches local prev_shopt=$(shopt -p nullglob) @@ -1170,6 +1174,11 @@ if ___eapi_has_eapply_user; then while read -r -d '' f; do f=${_eapply_user_patches[${f}]} if [[ -s ${f} ]]; then + if [[ -z ${applied} ]]; then + einfo "${PORTAGE_COLOR_INFO}$(for ((column = 0; column < ${columns} - 3; column++)); do echo -n =; done)${PORTAGE_COLOR_NORMAL}" + einfo "Applying user patches from ${basedir} ..." + fi + eapply "${f}" applied=1 fi @@ -1179,7 +1188,10 @@ if ___eapi_has_eapply_user; then ${prev_shopt} - [[ -n ${applied} ]] && ewarn "User patches applied." + if [[ -n ${applied} ]]; then + einfo "User patches applied." + einfo "${PORTAGE_COLOR_INFO}$(for ((column = 0; column < ${columns} - 3; column++)); do echo -n =; done)${PORTAGE_COLOR_NORMAL}" + fi } fi