diff options
| author | Ned Ludd <solar@gentoo.org> | 2006-04-30 14:17:49 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2006-04-30 14:17:49 +0000 |
| commit | f7aba48db07732d7d67e4189c31ca6fbff936248 (patch) | |
| tree | cf9addd42bec707e3a83a39eab9257073669cdca | |
| parent | 9152bcd2a2d0b1f79b9afed4e51970c6badc70a0 (diff) | |
| download | portage-f7aba48db07732d7d67e4189c31ca6fbff936248.tar.gz portage-f7aba48db07732d7d67e4189c31ca6fbff936248.tar.bz2 portage-f7aba48db07732d7d67e4189c31ca6fbff936248.zip | |
- People have started RESTRICTing "stricter", which we would like to discourage. bug 131779 (kevquinn)
svn path=/main/trunk/; revision=3289
| -rwxr-xr-x | bin/misc-functions.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 0a4c9ff94..df85d4db2 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -89,14 +89,14 @@ install_qa_check() { qa_var="QA_TEXTRELS_${ARCH}" [[ -n ${!qa_var} ]] && QA_TEXTRELS=${!qa_var} [[ -n ${QA_STRICT_TEXTRELS} ]] && QA_TEXTRELS="" - f=$(scanelf -qyRF '%t %p' "${D}" | grep -v ' usr/lib/debug/' | \ - gawk ' - BEGIN { split("'"${QA_TEXTRELS}"'", ignore); } - { for (idx in ignore) - if ($NF ~ "^"ignore[idx]"$") - next; - print; - }') + f=() + for s in $(scanelf -qyRF '%t %p' "${D}" | grep -v ' usr/lib/debug/'); do + [[ ${s} == "TEXTREL" ]] && continue + for t in ${QA_TEXTRELS}; do + [[ ${t} == ${s} ]] && continue 2 + done + f=( ${f} ${s} ) + done if [[ -n ${f} ]] ; then scanelf -qyRF '%T %p' "${PORTAGE_BUILDDIR}"/ &> "${T}"/scanelf-textrel.log echo -ne '\a\n' @@ -108,7 +108,7 @@ install_qa_check() { echo " For more information, see http://hardened.gentoo.org/pic-fix-guide.xml" echo " Please include this file in your report:" echo " ${T}/scanelf-textrel.log" - echo "${f}" + echo "${f[@]}" echo -ne '\a\n' die_msg="${die_msg} textrels," sleep 1 |