From patchwork Sat Mar 23 14:22:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 1048 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id F2D30CAEE8A9 for ; Sat, 23 Mar 2019 14:22:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00=-1, 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, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 23 Mar 2019 14:22:50 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 9CC291167A869F; Sat, 23 Mar 2019 14:22:49 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (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; Sat, 23 Mar 2019 14:22:49 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 6E3302C096; Sat, 23 Mar 2019 14:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1553350969; bh=h0/Y7pnaERcVztWAfHt3kZLD1Lnri0in+zybPFT8drE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=HHquJKAGBmKkCYyLVcIHx63WNbfYuHTKAoxPtcPB+pfkxOSxyRYADWVTA6R0aI2o1 CDgNRqL2acdULod0FffufeLc3GFrglMndu+G6776BubvXer5Yl5pRUnBEn/3KQSXeD ZfozmiU+tP+zy/IIQ+xkWqOXCv5R0rpdDOT+WkRZGcCHAcV6FjxMTTXrrTAF2LfF8S sstKFxyeofIHD92GhebKFZO+PFfwBJFOCwaAwjh+hqNSbORsly6jRnGWbDQjSVEK3i qUJAULGgMstPqVe3x7ypevsMscBDwSlmTfEjpaoLlZq4fSrXtM2+nKYjQhFBT0sLm0 su6rJFcv6OIwOUTOlCtlC8uZdySC2BtkNDUUTb7hB82zi5vno09KKBmcsGt//ch7F0 tGEGL6OXmqv8UMZk/Iy/SWiMWMjDBrBw9KdbmCiiO/gvzHmlNxoUEnZHpBVj4crl8h fYegtYegvRntEIxbUvMscETapXgfRIA7hBJy0xPkJg2PTTNg5BA3FdmmjoM3uaH1G+ rDxCnvahkm7osEKHSv8o25r3Q09pcKQ+9W8RGyD3G9ZE7Eh7VvaEEllw8b76YXCoeS 77fwE9zXNO0iZzAWafVnumnhtqH2jOshxhElOoV0jUu7PSARqwfKxB/aEJfkR2djik rPrD7GYcGICwo8BMzJkwk03I= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 96FDE2C090 for ; Sat, 23 Mar 2019 14:22:45 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 23 Mar 2019 14:22:45 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id B2ABB1167A869B; Sat, 23 Mar 2019 14:22:40 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a04:4540:6b0e:af00:36f3:9aff:feb6:7e8e]) (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: anthraxx) by orion.archlinux.org (Postfix) with ESMTPSA id 841401167A869A; Sat, 23 Mar 2019 14:22:40 +0000 (UTC) To: arch-projects@archlinux.org Date: Sat, 23 Mar 2019 15:22:33 +0100 Message-Id: <20190323142233.7113-1-anthraxx@archlinux.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH] makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Levente Polyak via arch-projects Reply-To: Arch Linux projects development discussion Cc: anthraxx@archlinux.org, Matt Robinson Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" From: Matt Robinson If makechrootpkg is called as non-root, the {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER environment variables are lost in the call to check_root(). Add these to the passed keepenv list so that they are preserved instead. --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..dc647b3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -341,7 +341,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH,GNUPGHOME + check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir")