From 2fdfee3856bbdd1d6d340cf6c2ca3519bb5d1dde Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 24 Dec 2008 19:31:59 +0000
Subject: Replace QA_DT_HASH with QA_PRESTRIPPED where appropriate. Thanks to
 Arfrever for reporting. Also, remove array support since bash arrays don't
 export anyway.

svn path=/main/trunk/; revision=12297
---
 bin/prepstrip | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/bin/prepstrip b/bin/prepstrip
index 4fb0760cd..589e30084 100755
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -82,20 +82,15 @@ if ! hasq binchecks ${RESTRICT} && \
 	! hasq strip ${RESTRICT} ; then
 	log=$T/scanelf-already-stripped.log
 	scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^$D##" > "$log"
-	if [[ -s $log && ${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then
-		if [[ ${#QA_DT_HASH[@]} -gt 1 ]] ; then
-			for x in "${QA_PRESTRIPPED[@]}" ; do
-				sed -e "s#^${x#/}\$##" -i "$log"
-			done
-		else
-			local shopts=$-
-			set -o noglob
-			for x in $QA_PRESTRIPPED ; do
-				sed -e "s#^${x#/}\$##" -i "$log"
-			done
-			set +o noglob
-			set -$shopts
-		fi
+	if [[ -n $QA_PRESTRIPPED && -s $log \
+		${QA_STRICT_PRESTRIPPED-unset} = unset ]] ; then
+		local shopts=$-
+		set -o noglob
+		for x in $QA_PRESTRIPPED ; do
+			sed -e "s#^${x#/}\$##" -i "$log"
+		done
+		set +o noglob
+		set -$shopts
 	fi
 	sed -e "/^\$/d" -e "s#^#/#" -i "$log"
 	if [[ -s $log ]] ; then
-- 
cgit v1.2.3-1-g7c22