From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1125093-garchives=archives.gentoo.org@lists.gentoo.org> 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 F1122138334 for <garchives@archives.gentoo.org>; Sun, 24 Nov 2019 20:00:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 971BEE086B; Sun, 24 Nov 2019 20:00:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 71186E086B for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2019 20:00:24 +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 9525334D2D4 for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2019 20:00:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FE7F8C1 for <gentoo-commits@lists.gentoo.org>; Sun, 24 Nov 2019 20:00:12 +0000 (UTC) From: "Thomas Deutschmann" <whissi@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org> Message-ID: <1574625555.53aaf284ba9ee180cf35a762ec50d695d224b0a0.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 53aaf284ba9ee180cf35a762ec50d695d224b0a0 X-VCS-Branch: master Date: Sun, 24 Nov 2019 20:00:12 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 57e85d74-cd38-4067-958b-625d0178143a X-Archives-Hash: 9695dd27b9ca430b915d4b15373b1b9f commit: 53aaf284ba9ee180cf35a762ec50d695d224b0a0 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Nov 19 16:36:00 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Nov 24 19:59:15 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=53aaf284 gen_determineargs.sh: determine_real_args(): Log when --no-clean forces --no-mrproper Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> gen_determineargs.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gen_determineargs.sh b/gen_determineargs.sh index c939fc9..5bbe33f 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -374,6 +374,17 @@ determine_real_args() { set_config_with_override BOOL INSTALL CMD_INSTALL "yes" set_config_with_override BOOL CLEANUP CMD_CLEANUP "yes" + # Special case: If --no-clean is specified on the command line, + # imply --no-mrproper. + if ! isTrue "${CLEAN}" + then + if isTrue "${MRPROPER}" + then + print_info 5 " MRPROPER forced to \"no\" due to --no-clean." + MRPROPER="no" + fi + fi + # We need to expand and normalize provided $KERNEL_DIR and # we need to do it early because $KERNEL_OUTPUTDIR will be # set to $KERNEL_DIR by default. @@ -636,16 +647,6 @@ determine_real_args() { fi fi - # Special case: If --no-clean is specified on the command line, - # imply --no-mrproper. - if [ "${CMD_CLEAN}" != '' ] - then - if ! isTrue "${CLEAN}" - then - MRPROPER="no" - fi - fi - local need_tar=no if [ -n "${MINKERNPACKAGE}" ]