Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Wed, 07 Feb 2018 05:24:51
Message-Id: 1517981064.4a0a949d601969c672d9cf70ef8cf8682553f787.zmedico@gentoo
1 commit: 4a0a949d601969c672d9cf70ef8cf8682553f787
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 7 05:22:29 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 05:24:24 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a0a949d
7
8 phase-functions.sh: suppress shellcheck SC1087
9
10 Adding braces to ${x} suppresses the following shellcheck
11 error:
12
13 SC1087: Braces are required when expanding arrays, as in ${array[idx]}.
14
15 Reported-by: R0b0t1 <r030t1 <AT> gmail.com>
16
17 bin/phase-functions.sh | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
21 index 10d54ca74..0ffabd99e 100644
22 --- a/bin/phase-functions.sh
23 +++ b/bin/phase-functions.sh
24 @@ -541,9 +541,9 @@ __dyn_install() {
25 # fnmatch patterns to regular expressions
26 for x in QA_DT_NEEDED QA_FLAGS_IGNORED QA_PRESTRIPPED QA_SONAME ; do
27 if [[ $(declare -p $x 2>/dev/null) = declare\ -a* ]] ; then
28 - eval "$x=(\"\${$x[@]}\" ${QA_PREBUILT//\*/.*})"
29 + eval "${x}=(\"\${${x}[@]}\" ${QA_PREBUILT//\*/.*})"
30 else
31 - eval "$x+=\" ${QA_PREBUILT//\*/.*}\""
32 + eval "${x}+=\" ${QA_PREBUILT//\*/.*}\""
33 fi
34 done