From c9911e5eb70a194a35dfddceb816f720bf7ae579 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 29 Apr 2013 21:53:49 -0700 Subject: [PATCH] bin/misc-functions.sh: normalize ${D%/}${D} slash This will fix bug #467886. --- bin/misc-functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 -- 2.26.2