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 6EA44138334 for ; Thu, 21 Mar 2019 03:26:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B501E086A; Thu, 21 Mar 2019 03:26:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1303AE086A for ; Thu, 21 Mar 2019 03:26:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11970335C7B for ; Thu, 21 Mar 2019 03:26:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51FAE565 for ; Thu, 21 Mar 2019 03:26:43 +0000 (UTC) From: "Mike Gilbert" 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 Gilbert" Message-ID: <1553138384.1e3d98c3aaf9844b67bc0b0b97011626abd394e6.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1e3d98c3aaf9844b67bc0b0b97011626abd394e6 X-VCS-Branch: master Date: Thu, 21 Mar 2019 03:26:43 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 82993260-74cf-4888-a0fb-c2628c3f311b X-Archives-Hash: 47161cfa7b5474bf88b7262dd8c28b44 commit: 1e3d98c3aaf9844b67bc0b0b97011626abd394e6 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 21 03:19:44 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 21 03:19:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3d98c3 sys-boot/grub: adjust bootstrap logic Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/grub/grub-9999.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 0663509415e..c35bda09b14 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -4,12 +4,11 @@ EAPI=6 if [[ ${PV} == 9999 ]]; then - GRUB_AUTOGEN=1 GRUB_AUTORECONF=1 GRUB_BOOTSTRAP=1 fi -if [[ -n ${GRUB_AUTOGEN} ]]; then +if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} ) inherit python-any-r1 fi @@ -164,14 +163,15 @@ src_prepare() { tests/util/grub-fs-tester.in \ || die - if [[ -n ${GRUB_AUTOGEN} ]]; then + if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then python_setup - if [[ -n ${GRUB_BOOTSTRAP} ]]; then - eautopoint --force - AUTOPOINT=: AUTORECONF=: ./bootstrap || die - else - ./autogen.sh || die - fi + fi + + if [[ -n ${GRUB_BOOTSTRAP} ]]; then + eautopoint --force + AUTOPOINT=: AUTORECONF=: ./bootstrap || die + elif [[ -n ${GRUB_AUTOGEN} ]]; then + ./autogen.sh || die fi if [[ -n ${GRUB_AUTORECONF} ]]; then