From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Apr 2013 04:53:49 +0000 (-0700)
Subject: bin/misc-functions.sh: normalize ${D%/}${D} slash
X-Git-Tag: v2.2.0_alpha174~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9911e5eb70a194a35dfddceb816f720bf7ae579;p=portage.git

bin/misc-functions.sh: normalize ${D%/}${D} slash

This will fix bug #467886.
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c83d21f68..17dea4e98 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -536,13 +536,13 @@ install_qa_check() {
 		die "Unsafe files found in \${D}.  Portage will not install them."
 	fi
 
-	if [[ -d ${D}/${D} ]] ; then
+	if [[ -d ${D%/}${D} ]] ; then
 		declare -i INSTALLTOD=0
-		for i in $(find "${D}/${D}/"); do
-			eqawarn "QA Notice: /${i##${D}/${D}} installed in \${D}/\${D}"
+		for i in $(find "${D%/}${D}"); do
+			eqawarn "QA Notice: /${i##${D%/}${D}} installed in \${D}/\${D}"
 			((INSTALLTOD++))
 		done
-		die "Aborting due to QA concerns: ${INSTALLTOD} files installed in ${D}/${D}"
+		die "Aborting due to QA concerns: ${INSTALLTOD} files installed in ${D%/}${D}"
 		unset INSTALLTOD
 	fi