* [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626)
@ 2016-04-20 18:56 Zac Medico
2016-04-20 20:46 ` Ulrich Mueller
2016-04-22 8:24 ` Alexander Berntsen
0 siblings, 2 replies; 3+ messages in thread
From: Zac Medico @ 2016-04-20 18:56 UTC (permalink / raw
To: gentoo-portage-dev; +Cc: Zac Medico
Only call eapply with a non-empty PATCHES array, as specified by PMS.
X-Gentoo-bug: 579626
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=579626
---
bin/phase-helpers.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 1a9ee7b..5af2784 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -806,7 +806,7 @@ __eapi4_src_install() {
__eapi6_src_prepare() {
if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]]; then
- eapply "${PATCHES[@]}"
+ [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
elif [[ -n ${PATCHES} ]]; then
eapply ${PATCHES}
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626)
2016-04-20 18:56 [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626) Zac Medico
@ 2016-04-20 20:46 ` Ulrich Mueller
2016-04-22 8:24 ` Alexander Berntsen
1 sibling, 0 replies; 3+ messages in thread
From: Ulrich Mueller @ 2016-04-20 20:46 UTC (permalink / raw
To: gentoo-portage-dev; +Cc: Zac Medico
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
>>>>> On Wed, 20 Apr 2016, Zac Medico wrote:
> Only call eapply with a non-empty PATCHES array, as specified by PMS.
> X-Gentoo-bug: 579626
> X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=579626
> ---
> bin/phase-helpers.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
> index 1a9ee7b..5af2784 100644
> --- a/bin/phase-helpers.sh
> +++ b/bin/phase-helpers.sh
> @@ -806,7 +806,7 @@ __eapi4_src_install() {
>
> __eapi6_src_prepare() {
> if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]]; then
> - eapply "${PATCHES[@]}"
> + [[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
> elif [[ -n ${PATCHES} ]]; then
> eapply ${PATCHES}
> fi
> --
> 2.7.4
Looks good to me. The spec explicitly checks for this condition too.
Ulrich
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626)
2016-04-20 18:56 [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626) Zac Medico
2016-04-20 20:46 ` Ulrich Mueller
@ 2016-04-22 8:24 ` Alexander Berntsen
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Berntsen @ 2016-04-22 8:24 UTC (permalink / raw
To: gentoo-portage-dev
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
OK. LGTM.
- --
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCgAGBQJXGd+fAAoJENQqWdRUGk8BRR8QAMAwVCpFeoXIfDQ3KIhecKrV
L1R5yxtLQyJv/cxe78mKmLynN1HiQ7P3354xAP8/UAyl6Ik4cjc15XbfyuJbyN/H
ccQQMvRcNAq8nGNOchvacq4YZUO+3nIoftw6wuMC+9RL4XoCibSbpWjDhKeEzudQ
CpbgPYlbnuTo+4YUp2H2ee4wsYuGx/XZjWVcrTxoEbQ5PP+fzBfWbbfqmMfSNC/E
Yu+A+L2GIJq26B04g+ugpWot7VBWcFPvXyQi80Va54h7tIF1JpRLdIkY2aEK4rTU
x9kje41ZpAn9i34U56eiy5ayVTc8FL+bOtM0Dt1rXC1NIdall14VQAS9ldmliSxv
0C9LTFGy/ALNoRrfIfyMAqWZTkrA97GmoArS/TTW9t/MO5tX1C0KsOrOCH82Gv9P
Ao1jIS80Qudjn2eq6yG7CNa+Z9H/V/QmApLdcvlkUq3Sw6wV3uPPZGoRWTH0ul5O
tbqz4pK8QpUeaYumU/OwKqXRZZPGirA+/OXdoyAleWi3lR948ctrxqsqeVosSfIB
3K3y5WXRkUrJtqZuTLX7ZSXz5Rlag+HCzGxG2/Qt3NHgU07azdQNRSmYpcB1DTvi
8tUAmkEwhVPq/o2E8u8CMKF+dySNo6nUEnDozHK7cglHUr3R9qzA+TWcjl7DLWpO
tW0ElKbK21CKLwBP9lBa
=GN2C
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-22 8:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-20 18:56 [gentoo-portage-dev] [PATCH] __eapi6_src_prepare: handle empty PATCHES array (bug 579626) Zac Medico
2016-04-20 20:46 ` Ulrich Mueller
2016-04-22 8:24 ` Alexander Berntsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox