From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 581B0158128 for ; Tue, 17 Jun 2025 03:01:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 3A5263425A2 for ; Tue, 17 Jun 2025 03:01:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 150A01104D9; Tue, 17 Jun 2025 03:00:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0C9521104D9 for ; Tue, 17 Jun 2025 03:00:54 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9AAE342678 for ; Tue, 17 Jun 2025 03:00:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39A0929F6 for ; Tue, 17 Jun 2025 03:00:50 +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: <1750129244.35f28ac4b092dac66588081d97c1f64404be2f87.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 35f28ac4b092dac66588081d97c1f64404be2f87 X-VCS-Branch: master Date: Tue, 17 Jun 2025 03:00:50 +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: dc5c656b-024a-4729-b7eb-8aa8db272fd3 X-Archives-Hash: f39331fd7813559b417ad47c3907db00 commit: 35f28ac4b092dac66588081d97c1f64404be2f87 Author: Kerin Millar plushkava net> AuthorDate: Tue Jun 17 02:39:17 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 17 03:00:44 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=35f28ac4 emerge-webrsync: import gentoo-functions.sh after isolated-functions.sh Source "gentoo-functions.sh" after sourcing "isolated-functions.sh". Otherwise, the implementations of various functions by the latter library - including einfo(), ewarn() and error() - shall prevail. Furthermore, since these functions are implemented by both libraries, jettison their namesakes from the emerge-webrsync utility. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index f49763ba36..76d98a9c20 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -621,24 +621,6 @@ do_latest_snapshot() { done } -# Opportunistically use gentoo-functions for nicer output -functions_script="${EPREFIX}/lib/gentoo/functions.sh" -source "${functions_script}" || { - echo "$0: Could not source ${functions_script}!" 1>&2 - - einfo() { - echo "${0##*/}: $*" - } - - ewarn() { - echo "${0##*/}: warning: $*" 1>&2 - } - - eerror() { - echo "${0##*/}: error: $*" 1>&2 - } -} - # Only echo if in normal mode vvecho() { (( opt[quiet] )) || echo "$@"; } # Only echo if in quiet mode @@ -668,6 +650,13 @@ export http_proxy https_proxy ftp_proxy source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 +# Opportunistically use gentoo-functions for its implementations of einfo(), +# ewarn() and eerror(). As of late, these are better maintained. +functions_script="${EPREFIX}/lib/gentoo/functions.sh" +if [[ -f ${functions_script} ]]; then + source "${functions_script}" || exit +fi + repo_name=gentoo repo_location=$(__repo_attr "${repo_name}" location) if [[ -z ${repo_location} ]]; then