Gentoo Archives: gentoo-portage-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH] drop support for QA_DT_HASH/QA_STRICT_DT_HASH
Date: Mon, 24 Sep 2012 03:16:41
Message-Id: 1348447769-9883-1-git-send-email-vapier@gentoo.org
1 These variables have been deprecated in favor of the new variables
2 QA_STRICT_FLAGS_IGNORED/QA_FLAGS_IGNORED, and the tree has been
3 converted over to the new ones, so drop the old vars.
4
5 Signed-off-by: Mike Frysinger <vapier@g.o>
6 ---
7 bin/misc-functions.sh | 25 -------------------------
8 1 file changed, 25 deletions(-)
9
10 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
11 index c8b7cc8..55d37f2 100755
12 --- a/bin/misc-functions.sh
13 +++ b/bin/misc-functions.sh
14 @@ -167,8 +167,6 @@ install_qa_check() {
15
16 cd "${ED}" || die "cd failed"
17
18 - # Merge QA_FLAGS_IGNORED and QA_DT_HASH into a single array, since
19 - # QA_DT_HASH is deprecated.
20 qa_var="QA_FLAGS_IGNORED_${ARCH/-/_}"
21 eval "[[ -n \${!qa_var} ]] && QA_FLAGS_IGNORED=(\"\${${qa_var}[@]}\")"
22 if [[ ${#QA_FLAGS_IGNORED[@]} -eq 1 ]] ; then
23 @@ -179,29 +177,6 @@ install_qa_check() {
24 set -${shopts}
25 fi
26
27 - qa_var="QA_DT_HASH_${ARCH/-/_}"
28 - eval "[[ -n \${!qa_var} ]] && QA_DT_HASH=(\"\${${qa_var}[@]}\")"
29 - if [[ ${#QA_DT_HASH[@]} -eq 1 ]] ; then
30 - local shopts=$-
31 - set -o noglob
32 - QA_DT_HASH=(${QA_DT_HASH})
33 - set +o noglob
34 - set -${shopts}
35 - fi
36 -
37 - if [[ -n ${QA_DT_HASH} ]] ; then
38 - QA_FLAGS_IGNORED=("${QA_FLAGS_IGNORED[@]}" "${QA_DT_HASH[@]}")
39 - unset QA_DT_HASH
40 - fi
41 -
42 - # Merge QA_STRICT_FLAGS_IGNORED and QA_STRICT_DT_HASH, since
43 - # QA_STRICT_DT_HASH is deprecated
44 - if [ "${QA_STRICT_FLAGS_IGNORED-unset}" = unset ] && \
45 - [ "${QA_STRICT_DT_HASH-unset}" != unset ] ; then
46 - QA_STRICT_FLAGS_IGNORED=1
47 - unset QA_STRICT_DT_HASH
48 - fi
49 -
50 # Check for files built without respecting *FLAGS. Note that
51 # -frecord-gcc-switches must be in all *FLAGS variables, in
52 # order to avoid false positive results here.
53 --
54 1.7.12

Replies