[gentoo-commits] repo/gentoo:master commit in: eclass/

[Justin Lecher]

commit:     8d5affaa9af5629958c0b70ddc33259084f75afc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:24:10 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 10:41:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5affaa

check-reqs.eclass: Require units for CHECKREQS_ in EAPIs > 5

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 eclass/check-reqs.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 0b66f54..793a730 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -199,13 +199,14 @@ check-reqs_get_number() {
 
 	local unit=${1:(-1)}
 	local size=${1%[GMT]}
+	local msg=eerror
+	[[ ${EAPI:-0} == [012345] ]] && msg=eqawarn
 
 	# Check for unset units and warn about them.
 	# Backcompat.
 	if [[ ${size} == ${1} ]]; then
-		eqawarn "Package does not specify unit for the size check"
-		eqawarn "Assuming mebibytes."
-		eqawarn "File bug against the package. It should specify the unit."
+		${msg} "Package does not specify unit for the size check"
+		${msg} "File bug against the package. It should specify the unit."
 	fi
 
 	echo ${size}