1 |
commit: 15c7e8bd8c6ee7f57d18de6fb8f931059200dd4c |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org> |
3 |
AuthorDate: Sat Apr 30 16:30:29 2011 +0000 |
4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 30 16:30:29 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=15c7e8bd |
7 |
|
8 |
install_qa_check(): Simplify code and make 'l' a local variable. |
9 |
|
10 |
--- |
11 |
bin/misc-functions.sh | 6 +++--- |
12 |
1 files changed, 3 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
15 |
index c310998..b28b73f 100755 |
16 |
--- a/bin/misc-functions.sh |
17 |
+++ b/bin/misc-functions.sh |
18 |
@@ -193,10 +193,10 @@ install_qa_check() { |
19 |
# 3) Null paths are banned because the loader will search $PWD when |
20 |
# it finds null paths. |
21 |
local forbidden_dirs="${PORTAGE_BUILDDIR}" |
22 |
- if [[ -n "$ROOT" ]] && [[ "$ROOT" != "/" ]]; then |
23 |
- forbidden_dirs="${forbidden_dirs} ${ROOT}" |
24 |
+ if [[ -n "${ROOT}" && "${ROOT}" != "/" ]]; then |
25 |
+ forbidden_dirs+=" ${ROOT}" |
26 |
fi |
27 |
- local dir="" rpath_files=$(scanelf -F '%F:%r' -qBR "${D}") |
28 |
+ local dir l rpath_files=$(scanelf -F '%F:%r' -qBR "${D}") |
29 |
f="" |
30 |
for dir in ${forbidden_dirs}; do |
31 |
for l in $(echo "${rpath_files}" | grep -E ":${dir}|::|: "); do |