From: Mike Pagano <mpagano@gentoo.org>
Date: Fri, 2 Dec 2016 20:19:43 +0000 (-0500)
Subject: kernel-2.eclass: Minor cleanup. Remove die from global scope per EAPI 6 rules.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebe7e5add54b4843f1c376d7def771b20c346895;p=gentoo.git

kernel-2.eclass: Minor cleanup. Remove die from global scope per EAPI 6 rules.
---

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 547153c0769b..91a24e9c6a17 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -544,9 +544,6 @@ elif [[ ${ETYPE} == headers ]]; then
 	unset KBUILD_OUTPUT
 
 	SLOT="0"
-else
-	eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
-	die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
 fi
 
 # Cross-compile support functions
@@ -1371,6 +1368,11 @@ kernel-2_pkg_setup() {
 	fi
 
 	ABI="${KERNEL_ABI}"
+	if [[ ${ETYPE} != sources ]] && [[ ${ETYPE} != headers ]]; then
+		eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
+		die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
+	fi
+
 	[[ ${ETYPE} == headers ]] && setup_headers
 	[[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..."
 }