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 870A1158074 for ; Sat, 28 Jun 2025 02:30:48 +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 7489234107A for ; Sat, 28 Jun 2025 02:30:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 080E311055F; Sat, 28 Jun 2025 02:30:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 EFFA911055F for ; Sat, 28 Jun 2025 02:30:37 +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 AAB9C340EAC for ; Sat, 28 Jun 2025 02:30:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2449B2AA8 for ; Sat, 28 Jun 2025 02:30:35 +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: <1751077817.2818148532b36d5f5c919b8bf9e13ccd2bdbb5a1.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2818148532b36d5f5c919b8bf9e13ccd2bdbb5a1 X-VCS-Branch: master Date: Sat, 28 Jun 2025 02:30:35 +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: 5bf5294d-7873-47a6-b701-335e8b787ccb X-Archives-Hash: 0c99030cc22e915e53b1aa642e3af7a1 commit: 2818148532b36d5f5c919b8bf9e13ccd2bdbb5a1 Author: Kerin Millar plushkava net> AuthorDate: Thu Jun 26 04:40:30 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 28 02:30:17 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=28181485 misc-function.sh: check for tar --xattrs support in a quieter way Presently, the __dyn_package() function employs the combination of a conditional expression and a command substitution to test whether tar(1) supports the --xattrs option. However, should the xtrace shell option happen to be enabled, the captured output of tar --help will be shown in its entirety, which is somewhat grating. Address this issue by instead using grep(1) to match against the output stream of tar(1). Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/misc-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 9ffe2274fc..d414e11f8f 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -538,7 +538,7 @@ __dyn_package() { [[ ${PORTAGE_VERBOSE} = 1 ]] && tar_options+=" -v" if contains_word xattr "${FEATURES}" \ - && [[ $(tar --help 2>/dev/null) == *--xattrs* ]] + && tar --help 2>/dev/null | grep -q -- --xattrs then tar_options+=" --xattrs" fi