Widen the search, as soon as we see $D inside $ED we bail out. We don't

have to check for $D in $D, because everything in $D that is not also in
$ED causes an emergency breakdown anyway.

svn path=/main/branches/prefix/; revision=6173

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 03c4b727526ef86087f362aea823e05243e6353d..6ac0f72b65b29c123e74f20aa85565d5c800da57 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -203,13 +203,13 @@ install_qa_check() {
                die "There are ${UNSAFE} unsafe files. Portage will not install them."
        fi
 
-       if [[ -d ${ED}/${ED} ]] ; then
+       if [[ -d ${ED}/${D} ]] ; then
                declare -i INSTALLTOD=0
-               for i in $(find "${ED}/${ED}/"); do
-                       eqawarn "QA Notice: /${i##${ED}/${ED}} installed in \${ED}/\${ED}"
+               for i in $(find "${ED}/${D}/"); do
+                       eqawarn "QA Notice: /${i##${ED}/${D}} installed in \${ED}/\${D}"
                        ((INSTALLTOD++))
                done
-               die "Aborting due to QA concerns: ${INSTALLTOD} files installed in ${ED}/${ED}"
+               die "Aborting due to QA concerns: ${INSTALLTOD} files installed in ${ED}/${D}"
                unset INSTALLTOD
        fi