| 1 |
commit: 8f7fd99571702fb59c190933e04cbbdd443d9052 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 27 09:34:24 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 10:41:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7fd995 |
| 7 |
|
| 8 |
check-reqs.eclass: Sanitize MERGE_TYPE for EAPI < 4 |
| 9 |
|
| 10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/check-reqs.eclass | 2 ++ |
| 13 |
1 file changed, 2 insertions(+) |
| 14 |
|
| 15 |
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass |
| 16 |
index e16e7c4..0b66f54 100644 |
| 17 |
--- a/eclass/check-reqs.eclass |
| 18 |
+++ b/eclass/check-reqs.eclass |
| 19 |
@@ -136,6 +136,8 @@ check-reqs_run() { |
| 20 |
# some people are *censored* |
| 21 |
unset CHECKREQS_FAILED |
| 22 |
|
| 23 |
+ [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE="" |
| 24 |
+ |
| 25 |
# use != in test, because MERGE_TYPE only exists in EAPI 4 and later |
| 26 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 27 |
[[ -n ${CHECKREQS_MEMORY} ]] && \ |
Archives