From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 10 May 2007 08:04:31 +0000 (-0000)
Subject: (hopefully) fix "outside of prefix" QA abort.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=73f5215f92670e6c7f35c1395b5ad77ba17f1b46;p=portage.git

(hopefully) fix "outside of prefix" QA abort.


svn path=/main/branches/prefix/; revision=6515
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 5ede5ffc1..0b947d198 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -196,25 +196,19 @@ install_qa_check() {
 	fi
 
 	if [[ -d ${ED}/${D} ]] ; then
-		declare -i INSTALLTOD=0
 		find "${ED}/${D}" | \
 		while read i ; do
 			eqawarn "QA Notice: /${i##${ED}/${D}} installed in \${ED}/\${D}"
-			((INSTALLTOD++))
 		done
 		die "Aborting due to QA concerns: ${INSTALLTOD} files installed in ${ED}/${D}"
-		unset INSTALLTOD
 	fi
 
 	if [[ -d ${ED}/${EPREFIX} ]] ; then
-		declare -i INSTALLTOD=0
 		find "${ED}/${EPREFIX}/" | \
 		while read i ; do
 			eqawarn "QA Notice: ${i#${ED}} double prefix"
-			((INSTALLTOD++))
 		done
 		die "Aborting due to QA concerns: ${INSTALLTOD} double prefix files installed"
-		unset INSTALLTOD
 	fi
 
 	if [[ -d ${D} ]] ; then
@@ -222,14 +216,14 @@ install_qa_check() {
 		find ${D%/} | sed -e "s|^${D%/}||g" | \
 		while read i ; do
 			if [[ ${#EPREFIX} -gt ${#i} && ${EPREFIX:0:${#i}} != ${i} ]] ; then
-				echo "QA Notice: ${i} outside of prefix"
-				((INSTALLTOD++))
+				eqawarn "QA Notice: ${i} outside of prefix"
+				INSTALLTOD=1
 			elif [[ ${#EPREFIX} -le ${#i} && ${i:0:${#EPREFIX}} != ${EPREFIX} ]] ; then
-				echo "QA Notice: ${i} outside of prefix"
-				((INSTALLTOD++))
+				eqawarn "QA Notice: ${i} outside of prefix"
+				INSTALLTOD=1
 			fi
 		done
-		[[ $INSTALLTOD > 0 ]] && die "Aborting due to QA concerns: ${INSTALLTOD} files installed outside the prefix"
+		[[ $INSTALLTOD > 0 ]] && die "Aborting due to QA concerns: there are files installed outside the prefix"
 		unset INSTALLTOD
 	fi