From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A30B1395E2 for ; Fri, 2 Dec 2016 20:21:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 726A5E0C2D; Fri, 2 Dec 2016 20:21:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51BD0E0C2D for ; Fri, 2 Dec 2016 20:21:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3508340F2A for ; Fri, 2 Dec 2016 20:21:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB4AD49D for ; Fri, 2 Dec 2016 20:21:01 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1480710020.ebe7e5add54b4843f1c376d7def771b20c346895.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: ebe7e5add54b4843f1c376d7def771b20c346895 X-VCS-Branch: master Date: Fri, 2 Dec 2016 20:21:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1d8169a8-e6c1-49c5-8b80-f12e3ccd7073 X-Archives-Hash: 0ce429937a9d85ebcdb8ecce55d49e0f commit: ebe7e5add54b4843f1c376d7def771b20c346895 Author: Mike Pagano gentoo org> AuthorDate: Fri Dec 2 20:19:43 2016 +0000 Commit: Mike Pagano gentoo 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 ..." }