[gentoo-commits] proj/portage:master commit in: bin/

[Ulrich Müller]

commit:     0127623435c2a4c8270a39333485ba1d829926a6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 08:01:53 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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