From patchwork Thu May 31 16:24:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Alexander Steffens X-Patchwork-Id: 572 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 A8A2F47F8852 for ; Thu, 31 May 2018 16:26:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_ADSP_CUSTOM_MED=0.001, DKIM_SIGNED=0.1,FREEMAIL_FROM=0.5,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_MED=-2.3,T_DKIM_INVALID=1 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [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 ; Thu, 31 May 2018 16:26:04 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 6DE47ADE36A6B; Thu, 31 May 2018 16:25:57 +0000 (UTC) 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 orion.archlinux.org (Postfix) with ESMTPS; Thu, 31 May 2018 16:25:50 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id F06892C772; Thu, 31 May 2018 16:25:42 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bre58aws Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 95FA02D309 for ; Thu, 31 May 2018 16:25:41 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 31 May 2018 16:25:41 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 8E17DADE369F8 for ; Thu, 31 May 2018 16:25:35 +0000 (UTC) Received: from mail-wr0-x229.google.com (mail-wr0-x229.google.com [IPv6:2a00:1450:400c:c0c::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Thu, 31 May 2018 16:25:35 +0000 (UTC) Received: by mail-wr0-x229.google.com with SMTP id o12-v6so2535771wrm.12 for ; Thu, 31 May 2018 09:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=24K1eiOjrRyYy/jGvBB20mtyw+ruW6tAxVQznX42PAs=; b=bre58awsp/N7/wr1AdVh/7g8xZY2aTdJIiFksMF+FqrOau+n7vBCED0hpSn2YlX1uB CYVqZ7NR8q3kmdEz8rw8poL7uja8psqGd1rFkvJp+tyKmRBfuGRaV+fvYIlI5HDGOsoL Ld7Nws1fIKgr9D10CBilopCRnVZxbYHRW5mv4/hg49+KDuk7m/E4vj6teM9IQ96rOCw2 J4cNWR3KBg2SFpoAfss3MEcY47WpYb5il5GZPG7b4TPtpgUFWjW1dBXgeEIE6aTyly5i Piwc93vuDeKtpU/DNmojSCSd17KUc8+dE75bdM6uTtJSQe3dEZxoY74DuaXmgPqIHBdm OdCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=24K1eiOjrRyYy/jGvBB20mtyw+ruW6tAxVQznX42PAs=; b=Q/YwILEBrMet4gtEErTxd6EVle0QkgB5gHnQLy3m4XBU7w6kHkPuJBtQlV1YKmvtEG E6DNIjoZcHiK8/1Gcq4uxpbtuYf387iP4B8EiT90E70D6Izp/yKKwRRmJURAEYuhs1ch y/Gi9DtTEQ9GWjAP6XpyeK07z1gs65P+QeroEexBQQtnoTdVFX98k2ctQksfUT+PC2US iwAf/uYsaMEvkkwtjqatDK4AqFwxvWxgqSaitO8fGkXkJlH9283ooEsbWo8vtKU0n7hv iGM/TUo+LWZg7RDbfMwQ/Zzwc/l7vAy4VdKFj1B4XhCPMhSx3Gyc9f1oUMdbUzluzPb/ u/XQ== X-Gm-Message-State: ALKqPwd9CwqfZ2db+mD4LPuTUjBzXIje6WzTgC6IpvYXrFPCOZGgpMHK 7vHA5w83/ihabZAvcoLYdSs/IuVK X-Google-Smtp-Source: ADUXVKJvnWr2mG8FhHAg5viSzKdho4tanHShL3PRdbfc/QUX2uzIr/94yk5Ik988d3q7XWlyDoaZSw== X-Received: by 2002:adf:ee0e:: with SMTP id y14-v6mr6020972wrn.63.1527783934951; Thu, 31 May 2018 09:25:34 -0700 (PDT) Received: from philomeena.fritz.box ([2001:470:6d:88a:6bec:9309:97:97c]) by smtp.gmail.com with ESMTPSA id v196-v6sm1685341wmf.36.2018.05.31.09.25.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 09:25:34 -0700 (PDT) From: "Jan Alexander Steffens (heftig)" To: pacman-dev@archlinux.org Date: Thu, 31 May 2018 18:24:52 +0200 Message-Id: <30e88ecca380f3109efc414aa404de78c1e9c32f.1527783895.git.jan.steffens@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [pacman-dev] [PATCH 07/10] makepkg: Make pkgdir a local X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Discussion list for pacman development Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 84ae08db..27f627ac 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -774,13 +774,13 @@ create_package() { } create_debug_package() { + local pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" + # check if a debug package was requested if ! check_option "debug" "y" || ! check_option "strip" "y"; then return fi - pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" - # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then return @@ -1122,7 +1122,7 @@ backup_package_variables() { } run_solo_packaging() { - pkgdir="$pkgdirbase/$pkgname" + local pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" if [[ -n $1 ]] || (( PKGFUNC )); then run_package $1