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 7627815814C for ; Fri, 13 Oct 2023 10:19:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A58CF2BC016; Fri, 13 Oct 2023 10:19:08 +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 87DCE2BC016 for ; Fri, 13 Oct 2023 10:19:08 +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 838AB335C7A for ; Fri, 13 Oct 2023 10:19:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA7661172 for ; Fri, 13 Oct 2023 10:19:05 +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: <1697192340.463af696914237bc6e210306fbc2f09f3a1005ce.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 463af696914237bc6e210306fbc2f09f3a1005ce X-VCS-Branch: master Date: Fri, 13 Oct 2023 10:19:05 +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: d482c147-a058-4f03-9927-376ebcc49649 X-Archives-Hash: e9cc47aafbd49bb3908fec7945464d35 commit: 463af696914237bc6e210306fbc2f09f3a1005ce Author: Raul E Rangel chromium org> AuthorDate: Thu Nov 10 04:26:18 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 13 10:19:00 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=463af696 bin/phase-functions: Move du stats into subshell These variables are only used inside this subshell. This avoids polluting the environment. Apparently this calculation isn't hermetic. I'm not sure why: @@ -268,10 +268,10 @@ declare -x cros_setup_hooks_run="booya" declare -a exclude_hermetic=([0]="--exclude-non-hermetic") declare -- f -declare -a isz=([0]="264" [1]="/var/tmp/portage/dev-libs/libffi-3.1-r8/image/") -declare -a nsz=([0]="2803" [1]="/var/tmp/portage/dev-libs/libffi-3.1-r8/work") +declare -a isz=([0]="16" [1]="/var/tmp/portage/dev-libs/libffi-3.1-r8/image/") +declare -a nsz=([0]="2599" [1]="/var/tmp/portage/dev-libs/libffi-3.1-r8/work") declare -- phase_func __eapi6_src_install () Bug: https://bugs.gentoo.org/914441 Signed-off-by: Raul E Rangel chromium.org> Signed-off-by: Sam James gentoo.org> bin/phase-functions.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 071941ff72..cd672a878c 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -620,12 +620,11 @@ __dyn_install() { # record build & installed size in build log if type -P du &>/dev/null; then - local nsz=( $(du -ks "${WORKDIR}") ) - local isz=( $(du -ks "${D}") ) - # subshell to avoid polluting the caller env with the helper # functions below ( + local nsz=( $(du -ks "${WORKDIR}") ) + local isz=( $(du -ks "${D}") ) # align $1 to the right to the width of the widest of $1 and $2 padl() { local s1=$1