From patchwork Sun Sep 3 07:53:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 243 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost.localdomain [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 1635E12C6F62 for ; Sun, 3 Sep 2017 07:54:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.1 Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 3 Sep 2017 07:54:02 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id DF7EB404A4; Sun, 3 Sep 2017 09:54:00 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Sun, 3 Sep 2017 09:54:00 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 890192BF2C; Sun, 3 Sep 2017 07:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1504425239; bh=cM9fXLTb7WdyjGM8CzXlhdsiioAsz4m7hRnjSIyjrHU=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Reply-To; b=Dm7sviyqM8PhKSIwMK0gA/lcXS8yCZcIek49FbSE8F9IqHpK3qLM0ccn5mLOCFqj4 AIqjn43Fa3VBhgelzNmABid1hcr1mZaBgozt7E0rzprZXDHU4Ql0+1dkIcH+SuHrQz 6AIuz8bVtlJKx1z9kPT4xBOhGDfjYkTLFz/VsFLel4IPyWZocbgzFPIa34Lira9knl aZqSVhgOOAtIw6RG393sDhLHE9o6WaTZcoROFjbImJ/7j2CmbFIMVQwV/F+8OIjruH J5KZN/TNdjgGvQdkpeR7oPBYQFfdqLXdNN0Jz7vfdhqWjbkK5aZ7Zbrqge74318W7h lCeeY9DhU3q5jrjzlQIt6PKr8Of67T/fsn48y62beHVp/N0A85s7Cb2Z4tBlaqY8Uf bTgE97aWPBdXmpV+mAP/fADnMnemqce0d0iRY86zphZIMaQ8p6r0RTXEwnOIlc8NCX k+EVdwStXjVeYwi0nKP/X1yly5dbOIyuu8jy6Blog81Zp3TL2axRenjnRb0A7atVi0 5Vgbrlo9iO7HGZIHONBivOa+VBZqMUibO1RNN9l76cAIwsAcQ/hl0W6Ljs4t7A/On4 RGYYnjdGAPhQB6P4bGkkmdZND6DY3RqTlvkX9tc5K9p/Y7YtlQs7WIGsCoSeNHoeDk f2HV3GuHt8CHQibSEsTfwTWQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id BEFA22BF0F for ; Sun, 3 Sep 2017 07:53:53 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 3 Sep 2017 07:53:53 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 7B854402E3; Sun, 3 Sep 2017 09:53:52 +0200 (CEST) Received: from vostro.home (ool-2f11b4dc.dyn.optonline.net [47.17.180.220]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: eschwartz) by nymeria.archlinux.org (Postfix) with ESMTPSA id E4BDB400F0; Sun, 3 Sep 2017 09:53:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=nymeria2; t=1504425232; bh=cM9fXLTb7WdyjGM8CzXlhdsiioAsz4m7hRnjSIyjrHU=; h=From:To:Subject:Date:In-Reply-To:References; b=XQg+KpUSgwQNy4WnvZ7Rhx5SYbw8v2/shU5KJ+v4oB9MdpFKjC+B6xWm33CduqDdk VV19YPUlw6bLCOuaV0hIbhKCH+efCo5R8pZQw/UAMH111iREmRQrFCdcqshZ37Ov4z 1X3p92rYzY2G3m+H7nWj2uvJlxxeurjBHyAg9rCM7tfJwqcFMy1Tx+ABSJGpUGWjzl IWN0/PWfWhXn0Wt/0l1fYexTqBu/OwWKGYOwByiZ304j7lVofKyPiN1iPSLmiTQHQ9 IXHCkESQOHBbl4vxsZf5W/+pETKP19LoSn+2qYhs9U3PAek5ZNsGNj5AXtMC+wwg2U Fy2QHc5LU62SYSLA4tJ2SVM4x9WbSZzJ00ZiPZZY5nyxvC9jB1dT6xqlIBwaYbTKXo Ib+BOFhaUdQcPLmp4sXRug53jyd+FrpcEd5UAnelKPjv2jyraEUcYpaYFua2sSpMSM GIkwAb9rxcucEw3s/lKXnbZKJV+9mVYp4Ewu16B1pbs3LC5mMT3WHECnWYNyGyNzZ/ WyHH/C577LNj5Ob7tKPtSfP1Ywwa/7JTEHcXARvK1Xp8raz+Wltf2gy8q1Nfrvx/wU jbvPtjqeN4vjiX4zeetLWl1un/Ac1chrYo60BalQXuoiJMVDYzBvJ3CiS1SFZsp5qr I9WOEOjJd0LphwXPhHG6ZP+Q= From: Eli Schwartz To: arch-projects@archlinux.org Date: Sun, 3 Sep 2017 03:53:39 -0400 Message-Id: <20170903075340.13311-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170901225313.3020-1-eschwartz@archlinux.org> References: <20170901225313.3020-1-eschwartz@archlinux.org> Subject: [arch-projects] [devtools] [PATCH v2 1/2] makechrootpkg: Fix unconditionally running namcap X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux projects development discussion Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" Fixes regression in 2fd5931a8c67289a8a4acd327b3ce99a5d64c8c7 $run_namcap will always be set to "" `if $not_a_var; then ...; fi` is always truthful when $not_a_var is unset or equal to "" and the `then` clause will always be run. I'm not sure why global state variables need to be cloned locally for their sole explicit purpose. But for now this patch implements the minimum necessary work to properly pass the "do I want namcap" variable into prepare_chroot() according to the current logic flow. Note that I have still not thorougly tested makechrootpkg. Signed-off-by: Eli Schwartz --- v2: somewhat more accurate commit message makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index ef3f2ec..fe9410d 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -408,7 +408,7 @@ main() { download_sources "$copydir" "$makepkg_user" - prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" + prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap" if arch-nspawn "$copydir" \ --bind="$PWD:/startdir" \ From patchwork Sun Sep 3 07:53:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 242 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost.localdomain [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 2EC7612C6F5F for ; Sun, 3 Sep 2017 07:54:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.1 Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 3 Sep 2017 07:54:00 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id AC40F403EB; Sun, 3 Sep 2017 09:53:58 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Sun, 3 Sep 2017 09:53:58 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5F2D02BF0F; Sun, 3 Sep 2017 07:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1504425238; bh=8GJ1vLuOdJPa/5lDqd2BWA1os19rkzQFRNL0MMIMkyY=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Reply-To; b=qvG776xhcyjDFOds8xuv/ufCggJuvb2wNyf20Q+G8yIe4IsYVsBXW9HCC7lU1odra 5bI9JWnHLZpPmFZ6OFbTYYonDV1Bu58yijvVOFjT8JByGz4w5bANO86jbwl0UldpkT wqPOLYvtoo1Ot3GPHuT0/VQXBPzQ7dk+kARR4ES9F+aZhkAaMkx3fgHO5qLpPxFztf VlVVxnkTZx7C8wn83jxAeXM0zl0xdaxXSg2AzxrgXxWBvt/Avcx2mInM9l0SFy7/15 b7MMQAMlhkS+nhcJicBJdCWi8IKCGM+M4eckkV8bUD5mXxLz6Xz9TkKeMtuWBUZvX1 HcJJOgKJqI7OACk5VCRX4eBLEh2wgST1u8KnA9M1kJlW5/U80Zk9Is+/69k8shShXP Kxgn3ADK8Ndf6kFcRApRh3JinF0lQ9JBvnEqja9gGYzisIUlV9D0E+wK2WaPfbM/G4 6n/EjaDJYkDs+jyFetAzg/OICW4jGEwxhs0SbS3ry6C6BMD6FkqUUiqZiph3DfXYd+ q1728NxfbUNdFv+gUveCveuojzsc/wx/uGOE5D65pBESaJdX0s8p6ecSmqJ2UT4nRH D7SKwBswDltUqskwjMIpoSQTuNAkNe2Ul0wrnwKFkzKpmaMrJELP9l00kKbvDbswZo uX9iaRsQK2zDeswhRT1Crh5o= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id C171A2BF12 for ; Sun, 3 Sep 2017 07:53:54 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 3 Sep 2017 07:53:54 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 8A2F440499; Sun, 3 Sep 2017 09:53:53 +0200 (CEST) Received: from vostro.home (ool-2f11b4dc.dyn.optonline.net [47.17.180.220]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: eschwartz) by nymeria.archlinux.org (Postfix) with ESMTPSA id BE525403EB; Sun, 3 Sep 2017 09:53:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=nymeria2; t=1504425233; bh=8GJ1vLuOdJPa/5lDqd2BWA1os19rkzQFRNL0MMIMkyY=; h=From:To:Subject:Date:In-Reply-To:References; b=q6KRSL7ffX8LJrgeKpYzbt7yTIgGnb74auu9d1zjCGd1+NOofe1pK3PKfJhaBUS3n 5iVxSI6Ly4WqgTWqnZKctQkNvM1QpfYrttpYUH5tfdpE7uZMzu7JPEtuc58uIVhx3i dPNr8mbG92fV7eJuQkH6a3bb69dAvzwzWC0eOIWriqteWt734TJcD3TPGwnlTrwZfq 7RvTxh3hds43R9k4jfejQaT9/92TxXQRgV1jRxSHg4wp4LNJ1nfinP30l66YOq5c+d ltf14JEEqti3PRCUpOThQ3uZellksJ7LQiTlaShGeunVaEY0sV+bq+/pyFmvPC/YVY htmexyl4KFAHkiz9k5MQ2AovyYwtw6W9RXP8AJvd1x/mInLZc2Ckt0Nbgm5niEZjZH klExo/xG5+dAbVoJlNhLR7dwyScFhNsq4ap4CMsTc19gileaDjnaS+btlFAyyNYXtQ 9xG8x57MrQ7titkaDfU9OHDDLBrIjl0p3Newk7nW83Fe+F8+gn6JUPB3GcvQjjm59O FvdvlA/8afZ4onlVJ2oGQng8LLVW/hhYKhTKjF+BrA3mLWcNyB7AO+nlYZ23Hq3hza 1eN7Bb7KiXeIWJeb9aanVm3g9hgQHDhNMzirV6TQBGLSrqNbLlTAZt/kQ9g++6MOrk DILXapErrtWp3MdvxzWZfmIU= From: Eli Schwartz To: arch-projects@archlinux.org Date: Sun, 3 Sep 2017 03:53:40 -0400 Message-Id: <20170903075340.13311-2-eschwartz@archlinux.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170903075340.13311-1-eschwartz@archlinux.org> References: <20170901225313.3020-1-eschwartz@archlinux.org> <20170903075340.13311-1-eschwartz@archlinux.org> Subject: [arch-projects] [devtools] [PATCH v2 2/2] makechrootpkg: Fix anti-pattern when checking for enabled features X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux projects development discussion Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" Don't use error-prone logic e.g. foo=true; if $foo ... This completely fails to act as expected when the variable is unset because of unrelated bugs. While this merely causes the default behavior to be "false" rather than "true" in such cases, it is better to fail to enable explicitly requested behavior (which will be noticed by the user) than to simply upgrade to this behavior for free (which may not seem to have any obvious cause). Signed-off-by: Eli Schwartz --- v2: somewhat more accurate commit message makechrootpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index fe9410d..ebea171 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -188,7 +188,7 @@ prepare_chroot() { local keepbuilddir=$3 local run_namcap=$4 - $keepbuilddir || rm -rf "$copydir/build" + [[ $keepbuilddir = true ]] || rm -rf "$copydir/build" local builduser_uid builduser_gid builduser_uid="${SUDO_UID:-$UID}" @@ -230,7 +230,7 @@ EOF declare -f _chrootbuild printf '_chrootbuild "$@" || exit\n' - if $run_namcap; then + if [[ $run_namcap = true ]]; then declare -f _chrootnamcap printf '_chrootnamcap || exit\n' fi