Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626)
Date: Wed, 20 Apr 2016 18:56:54
Message-Id: 1461178584-5364-1-git-send-email-zmedico@gentoo.org
1 Only call eapply with a non-empty PATCHES array, as specified by PMS.
2
3 X-Gentoo-bug: 579626
4 X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=579626
5 ---
6 bin/phase-helpers.sh | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
10 index 1a9ee7b..5af2784 100644
11 --- a/bin/phase-helpers.sh
12 +++ b/bin/phase-helpers.sh
13 @@ -806,7 +806,7 @@ __eapi4_src_install() {
14
15 __eapi6_src_prepare() {
16 if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]]; then
17 - eapply "${PATCHES[@]}"
18 + [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
19 elif [[ -n ${PATCHES} ]]; then
20 eapply ${PATCHES}
21 fi
22 --
23 2.7.4

Replies