projects
/
gentoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05e71d1
)
check-reqs.eclass: Sanitize MERGE_TYPE for EAPI < 4
author
Justin Lecher
<jlec@gentoo.org>
Sun, 27 Dec 2015 09:34:24 +0000
(10:34 +0100)
committer
Justin Lecher
<jlec@gentoo.org>
Sat, 2 Jan 2016 10:41:26 +0000
(11:41 +0100)
Signed-off-by: Justin Lecher <jlec@gentoo.org>
eclass/check-reqs.eclass
patch
|
blob
|
history
diff --git
a/eclass/check-reqs.eclass
b/eclass/check-reqs.eclass
index e16e7c43f76f9dfd109e9fbd093a05b264e5f129..0b66f5459ef8043347758556af03cc81cb38b45a 100644
(file)
--- a/
eclass/check-reqs.eclass
+++ b/
eclass/check-reqs.eclass
@@
-136,6
+136,8
@@
check-reqs_run() {
# some people are *censored*
unset CHECKREQS_FAILED
+ [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE=""
+
# use != in test, because MERGE_TYPE only exists in EAPI 4 and later
if [[ ${MERGE_TYPE} != binary ]]; then
[[ -n ${CHECKREQS_MEMORY} ]] && \