Gentoo Archives: gentoo-dev

From:	Justin Lecher <jlec@g.o>
To:	gentoo-dev@l.g.o
Cc:	qa@g.o, Justin Lecher <jlec@g.o>
Subject:	[gentoo-dev] [PATCH 7/9] check-reqs.eclass: Sanitize MERGE_TYPE for EAPI < 4
Date:	Mon, 28 Dec 2015 08:48:38
Message-Id:	`1451292235-25265-8-git-send-email-jlec@gentoo.org`
In Reply to:	[gentoo-dev] [PATCH 0/9] Cleanup and EAPI=6 support for check-reqs.eclass by Justin Lecher

1	Signed-off-by: Justin Lecher <jlec@g.o>
2	---
3	eclass/check-reqs.eclass \| 2 ++
4	1 file changed, 2 insertions(+)
5
6	diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
7	index ad032b9..4513904 100644
8	--- a/eclass/check-reqs.eclass
9	+++ b/eclass/check-reqs.eclass
10	@@ -136,6 +136,8 @@ check-reqs_run() {
11	# some people are censored
12	unset CHECKREQS_FAILED
13
14	+ [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE=""
15	+
16	# use != in test, because MERGE_TYPE only exists in EAPI 4 and later
17	if [[ ${MERGE_TYPE} != binary ]]; then
18	[[ -n ${CHECKREQS_MEMORY} ]] && \
19	--
20	2.6.4