Message ID | 20191028153739.2034607-1-eschwartz@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 1790614BAB732 for <patchwork@archlinux.org>; Mon, 28 Oct 2019 15:37:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for <patchwork@archlinux.org>; Mon, 28 Oct 2019 15:37:57 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 14C5C1623FB179; Mon, 28 Oct 2019 15:37:56 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Mon, 28 Oct 2019 15:37:56 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D70362D9E0; Mon, 28 Oct 2019 15:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1572277075; bh=AeLRTDlKBuGDqldW20VR+W4QV8HNYnXLvpba7yN7nVo=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=I+PTONtqUvOBWWhMUX5Tr7rIn2GGWAtDx/RCbW68vMh4E0Mucmf1dIY/vG/3WipnZ gN2Xv8gWXUD6hsWxaDm85IRaUUwvMoeAp29AGA1Hpd7xY1YNRQ72px6bTMza9jZttU kTmjhSUDNhnl0COKwvZ0XOPMPfXgOY7cgtb6AvcRBoDzG8ZBHUI/qaNKHEwwn5zLQv eMT7y+2NcV9pMiY+hUDzxMZR7kDJlm3/9NadZCq5WIvQBP+boJoYWC9yB1DVH9cj8B F/ERtRc/bLTvu8uSzi22ZMKYszQpBubHLJiQQUHd4iK9S32sz+GY/24HrJhuvVfi7k PyxcIP0jmKZfn0dymUxO7uCUkRx7nmxO9UdkE1kehM1XZBhXqiiPTruEnMBbIhVsT5 p6b1eorbcWocT1HIq8sPtYdLqWZmSzGZXu8UhCqAMvMa+FcXwLJ6dYLMzgOtOMb94Q 093dLCnHNs4o+JvCioUHsQINHlH8tXbAqRbImKm9biSvI0rbTYLw5rglSVqeK79jKR 8oAW54XVI0vRGfyvP6w3KV7xiKzGELXA/ntCybvxWtFO85bbMHptSjfbbKjJjv6Usy FKeL7FSIAvW52SuIcLXs0he6xYUiUPajM4B6MVju83o+lmw/UGxLGWhhg7bU6yZ8q6 bpRzaiIQhWpmewO1Ki+g6vs8= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id BF0F92D97F for <pacman-dev@lists.archlinux.org>; Mon, 28 Oct 2019 15:37:51 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Mon, 28 Oct 2019 15:37:51 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id B717B1623FB175; Mon, 28 Oct 2019 15:37:50 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 297831623FB174; Mon, 28 Oct 2019 15:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1572277070; bh=AeLRTDlKBuGDqldW20VR+W4QV8HNYnXLvpba7yN7nVo=; h=From:To:Subject:Date; b=cbORBzsgSylZUyUeJcF5nZys8PEx7zOUIRffJJgDsD1b/8zCd3DIgoEGQktsshHH6 eLDwa4ChuS+jyaYiTUutC9KFIk/LQUZ36WE4AgQDok7fXh06F8IrH4BY2YwQAFaU8+ I6H+2Dr87k3qWvN59U/dLy6N2Jjgu+KjkPUUbFi7esr1muENcMolm933ARoJJDgLze VLftCIXZUEzbZY2VBFXG0S1mU9uWWenIAK/enb9XfxkFULWk6WKrJ+YN5w1OEuLj8S ubOpFd+a6rH6MV4B1TUDapNgpaVjyEH7tETP028W3Bk5DoXV7XdRFO4eQ7cpFp4CXH P1gEGRRrOP0SU/VF5XryZilkHIB+qQrXSnrpBFc5KOdEL2rW+fMXa4dDGiWi9FJH+k SO7DIhmL1hWLkjkv3H5zjAD7z5o01H6OU4QWsm2Ro8rglyLN2lmOlw4WSJDK2JhY2W 5o3eh8fBJrpeTpQN0dTScVsHBJ0NiCLf0y3b1fBe+OaFJb944U9Or2TEqzC8y3XQ8O TQ33442dMOE0M7Y+H16eOhNf79sk9J8FH/v7f5TtGA7sCFnboqUfl5QyzQzCixmlfz I5w5RO7SBmMD+xUwZLIuwzshhc8Vb+7IMFfVBjpUliGbeMn91XDIlUtw/IKV9/9tyO hutR7BX2vhyHscvXzp1W55tY= From: Eli Schwartz <eschwartz@archlinux.org> To: pacman-dev@archlinux.org Date: Mon, 28 Oct 2019 11:37:39 -0400 Message-Id: <20191028153739.2034607-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [pacman-dev] [PATCH] makepkg: only run --clean actions if we built a package X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman development <pacman-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-dev/> List-Post: <mailto:pacman-dev@archlinux.org> List-Help: <mailto:pacman-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=subscribe> Reply-To: Discussion list for pacman development <pacman-dev@archlinux.org> Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" <pacman-dev-bounces@archlinux.org> |
Series |
[pacman-dev] makepkg: only run --clean actions if we built a package
|
expand
|
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d217d0a4..c49ac57a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -133,7 +133,7 @@ clean_up() { rm "$logpipe" fi - if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then + if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && BUILDPKG && CLEANUP )); then local pkg file # If it's a clean exit and -c/--clean has been passed...
Fixes issue where users were allowed to run cleanup while running --geninteg or --printsrcinfo or --packagelist, thus mixing invalid responses into stdout. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)