bin/misc-functions.sh: normalize ${D%/}${D} slash
authorZac Medico <zmedico@gentoo.org>
Tue, 30 Apr 2013 04:53:49 +0000 (21:53 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 30 Apr 2013 04:53:49 +0000 (21:53 -0700)
This will fix bug #467886.

bin/misc-functions.sh

index c83d21f68ebfaeed9651e6d4753a117d4b23212b..17dea4e98f8d835a71478c9a3882b34c7873093c 100755 (executable)
@@ -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