diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-04-30 18:30:29 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-04 12:47:54 -0700 |
| commit | 537dd5662c9e62a9546e35cbab826c52173c3fa6 (patch) | |
| tree | e2c65a332c5d80513eb7854bbb59a8977cf36975 | |
| parent | fdb5ea2d56c800fdefbec49f602f78158e388f64 (diff) | |
| download | portage-537dd5662c9e62a9546e35cbab826c52173c3fa6.tar.gz portage-537dd5662c9e62a9546e35cbab826c52173c3fa6.tar.bz2 portage-537dd5662c9e62a9546e35cbab826c52173c3fa6.zip | |
install_qa_check(): Simplify code and make 'l' a local variable.
| -rwxr-xr-x | bin/misc-functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index c3109981d..b28b73fff 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -193,10 +193,10 @@ install_qa_check() { # 3) Null paths are banned because the loader will search $PWD when # it finds null paths. local forbidden_dirs="${PORTAGE_BUILDDIR}" - if [[ -n "$ROOT" ]] && [[ "$ROOT" != "/" ]]; then - forbidden_dirs="${forbidden_dirs} ${ROOT}" + if [[ -n "${ROOT}" && "${ROOT}" != "/" ]]; then + forbidden_dirs+=" ${ROOT}" fi - local dir="" rpath_files=$(scanelf -F '%F:%r' -qBR "${D}") + local dir l rpath_files=$(scanelf -F '%F:%r' -qBR "${D}") f="" for dir in ${forbidden_dirs}; do for l in $(echo "${rpath_files}" | grep -E ":${dir}|::|: "); do |