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 56ED3158649 for ; Fri, 12 May 2023 17:23:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94264E07E6; Fri, 12 May 2023 17:23:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78311E07E6 for ; Fri, 12 May 2023 17:23:09 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B35D8340815 for ; Fri, 12 May 2023 17:23:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36AC5A5E for ; Fri, 12 May 2023 17:23:07 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1683889484.0127623435c2a4c8270a39333485ba1d829926a6.ulm@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/estrip bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 0127623435c2a4c8270a39333485ba1d829926a6 X-VCS-Branch: master Date: Fri, 12 May 2023 17:23:07 +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: 19d69479-8fad-4ee9-922d-0a96d6b47ef6 X-Archives-Hash: 2f8d3ed281feb2c6ea84905518495ac6 commit: 0127623435c2a4c8270a39333485ba1d829926a6 Author: Ulrich Müller gentoo org> AuthorDate: Fri May 12 08:01:53 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri May 12 11:04:44 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=01276234 misc-functions.sh: Don't call the prepallstrip helper Otherwise it will output a deprecation warning. Instead, call estrip directly with the new --prepallstrip option. This affects only EAPI 6 and earlier and does not change functionality. Fixes: 63d6f2e8985de480c21a5c2f09bba1547c7de6b8 Signed-off-by: Ulrich Müller gentoo.org> bin/estrip | 7 ++++++- bin/misc-functions.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/estrip b/bin/estrip index cb4caca3e..6026c7f76 100755 --- a/bin/estrip +++ b/bin/estrip @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/helper-functions.sh || exit 1 @@ -117,6 +117,11 @@ while [[ $# -gt 0 ]] ; do [[ -n ${2} ]] && die "${0##*/}: --dequeue takes no additional arguments" break ;; + --prepallstrip) + [[ $# -eq 1 ]] || die "${0##*/}: $1 takes no additional arguments" + prepstrip=true + break + ;; *) die "${0##*/}: unknown arguments '$*'" exit 1 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 235823afc..d9319d5af 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -265,7 +265,7 @@ install_qa_check() { "${PORTAGE_BIN_PATH}"/estrip --ignore "${PORTAGE_DOSTRIP_SKIP[@]}" "${PORTAGE_BIN_PATH}"/estrip --dequeue else - prepallstrip + "${PORTAGE_BIN_PATH}"/estrip --prepallstrip fi fi } @@ -302,7 +302,7 @@ __dyn_instprep() { "${PORTAGE_BIN_PATH}"/estrip --ignore "${PORTAGE_DOSTRIP_SKIP[@]}" "${PORTAGE_BIN_PATH}"/estrip --dequeue else - prepallstrip + "${PORTAGE_BIN_PATH}"/estrip --prepallstrip fi fi