diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-04-29 21:53:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-04-29 21:53:49 -0700 |
| commit | c9911e5eb70a194a35dfddceb816f720bf7ae579 (patch) | |
| tree | af1325d0a8a426b09795c4126244eb122e692d97 | |
| parent | repoman: report --ignore/include-arches commits (diff) | |
| download | portage-c9911e5eb70a194a35dfddceb816f720bf7ae579.tar.gz portage-c9911e5eb70a194a35dfddceb816f720bf7ae579.tar.bz2 portage-c9911e5eb70a194a35dfddceb816f720bf7ae579.zip | |
bin/misc-functions.sh: normalize ${D%/}${D} slash
This will fix bug #467886.
| -rwxr-xr-x | bin/misc-functions.sh | 8 |
1 files 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 |