summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-24 19:31:59 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-24 19:31:59 +0000
commit2fdfee3856bbdd1d6d340cf6c2ca3519bb5d1dde (patch)
treea567570a70326a3e6c44049f55033bda060bb24e
parent16e1443f5b969047299b1f73992f3eacd131e1c5 (diff)
downloadportage-2fdfee3856bbdd1d6d340cf6c2ca3519bb5d1dde.tar.gz
portage-2fdfee3856bbdd1d6d340cf6c2ca3519bb5d1dde.tar.bz2
portage-2fdfee3856bbdd1d6d340cf6c2ca3519bb5d1dde.zip
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
-rwxr-xr-xbin/prepstrip23
1 files 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