From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Sep 2009 09:11:35 +0000 (-0000)
Subject: Fix false positives in gcc QA with debug mode some more. Thanks again to
X-Git-Tag: v2.2_rc41~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1479bd0ed1182f4a753e2732f1bf43140951ff0;p=portage.git

Fix false positives in gcc QA with debug mode some more. Thanks again to
Amit Dor-Shifer <amitds@oversi.com> for reporting.

svn path=/main/trunk/; revision=14218
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 93d5eca6d..0249063c5 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -408,8 +408,8 @@ install_qa_check() {
 
 	# Evaluate misc gcc warnings
 	if [[ -n ${PORTAGE_LOG_FILE} && -r ${PORTAGE_LOG_FILE} ]] ; then
-		# In debug mode, this variable definition will produce
-		# a false positive if it's shown in the trace.
+		# In debug mode, this variable definition and corresponding grep calls
+		# will produce false positives if they're shown in the trace.
 		local reset_debug=0
 		if [[ ${-/x/} != $- ]] ; then
 			set +x
@@ -424,7 +424,6 @@ install_qa_check() {
 			": warning: comparisons like X<=Y<=Z do not have their mathematical meaning$"
 			": warning: null argument where non-null required "
 		)
-		[[ $reset_debug = 1 ]] && set -x
 		abort="no"
 		i=0
 		while [[ -n ${msgs[${i}]} ]] ; do
@@ -440,6 +439,7 @@ install_qa_check() {
 				abort="yes"
 			fi
 		done
+		[[ $reset_debug = 1 ]] && set -x
 		f=$(cat "${PORTAGE_LOG_FILE}" | \
 			"$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py)
 		if [[ -n ${f} ]] ; then