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

[Mike Pagano]

commit:     ebe7e5add54b4843f1c376d7def771b20c346895
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 20:19:43 2016 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 20:20:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe7e5ad

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

 eclass/kernel-2.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 547153c..91a24e9 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 ..."
 }