public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Justin Lecher <jlec@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: qa@gentoo.org, Justin Lecher <jlec@gentoo.org>
Subject: [gentoo-dev] [PATCH 7/9] check-reqs.eclass: Sanitize MERGE_TYPE for EAPI < 4
Date: Mon, 28 Dec 2015 09:43:53 +0100	[thread overview]
Message-ID: <1451292235-25265-8-git-send-email-jlec@gentoo.org> (raw)
In-Reply-To: <1451292235-25265-1-git-send-email-jlec@gentoo.org>

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 eclass/check-reqs.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index ad032b9..4513904 100644
--- 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} ]] && \
-- 
2.6.4



  parent reply	other threads:[~2015-12-28  8:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-28  8:43 [gentoo-dev] [PATCH 0/9] Cleanup and EAPI=6 support for check-reqs.eclass Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 1/9] check-reqs.eclass: Only inherit eclass once Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 2/9] check-reqs.eclass: Use eqawarn() from eutils.eclass Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 3/9] check-reqs.eclass: Mark interal function with @INTERNAL Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 4/9] check-reqs.eclass: Fix typo Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 5/9] check-reqs.eclass: Replace obsolete df option -m with -B ### Justin Lecher
2015-12-28 13:58   ` Andrew Savchenko
2015-12-28 14:16     ` Justin Lecher (jlec)
2015-12-28 14:24   ` Michał Górny
2015-12-28 14:28     ` Justin Lecher (jlec)
2015-12-28 14:34       ` Michał Górny
2015-12-28 15:27         ` [gentoo-dev] [PATCH] Replace df -m with df -k Justin Lecher
2015-12-28 15:27           ` [gentoo-dev] [PATCH] check-reqs.eclass: Replace obsolete df option -m with -k Justin Lecher
2015-12-28 15:41             ` Michał Górny
2015-12-28 15:45               ` Justin Lecher (jlec)
2015-12-28  8:43 ` [gentoo-dev] [PATCH 6/9] check-reqs.eclass: Ban obsolete functions in newer EAPIs Justin Lecher
2015-12-28  8:43 ` Justin Lecher [this message]
2015-12-28  8:43 ` [gentoo-dev] [PATCH 8/9] check-reqs.eclass: Require units for CHECKREQS_ in EAPIs > 5 Justin Lecher
2015-12-28  8:43 ` [gentoo-dev] [PATCH 9/9] check-reqs.eclass: Enable EAPI 6 support Justin Lecher
2015-12-28  9:35 ` [gentoo-dev] [PATCH 0/9] Cleanup and EAPI=6 support for check-reqs.eclass Andrew Savchenko
2015-12-28  9:40   ` Justin Lecher (jlec)
2015-12-28 12:34     ` Andrew Savchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1451292235-25265-8-git-send-email-jlec@gentoo.org \
    --to=jlec@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    --cc=qa@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox