Message ID | 20170706033022.17350-1-allan@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id jegbH92uXVlCCgAAtiB/HQ for <patchwork@archlinux.org>; Thu, 06 Jul 2017 05:30:37 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 49B72401DC; Thu, 6 Jul 2017 05:30:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 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; Thu, 6 Jul 2017 05:30:36 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id ECF622C0AD; Thu, 6 Jul 2017 03:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1499311835; bh=KfifLP2gDjHVfzCPpBcecL3jv1PY+WtHfkeAl+xCduk=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=Er09YcyI07Y8gptGWQc5VoObtoWV0N4ByPfvX1nZNGQBFVEaHk4rwHir503Qejai/ YIV6/a/AQNKU4gb3fbaPsMAmbsjEOtC4zsb3ae+GBwSaUcYQMT6Ryuc6DzhWaF8ddj aVtPx8NjcqpjfQx+fu7ZIEOGNCa6zyYfio3279T15MFCd6lNE5R3DA4b91DzPqlBnW 8TdXpnBK2mr/zmFCg8uPi+jKYcr242tprV5la5ML3cgNt/LfhGLJclZhBzK7poatBj h8d5ze0dyDHdefeFr/Jrwwd25QTnvnbOoAxAwQ/n5mI4ZY8JmPQP/R9iheLjIVSMPR S/uBFQop9Pn1duoK7yTmHs30AzljE31wLYdUwkbebMKB3VYrYXVePMHyRXhiCipyvp VggZ+Kj7q2wXygi4YoCWWQhOu+2H8jQZP6dzB0cKm531nBthJeoqPMYx3PVr2zTE4w 69YybRZVOl16jt5513KGjqj1UqPPHVYN/iGe4hpzx97Bb0J8oEyheAb08v26L2qZzq jMaaoGfsjGVi68JhlHrF6fiZD070+fgyHxH9CjqfZoSsNt2Pg9bUl5ZkjsvauaK1KP FFwSjSGpd2YhKtGb9gUY9Px2dfFWJxkvDK9QjpkAwegsiJmYsNTqxZfb1Tnfret2Cn Gb7d2iWQ3B2QXIcNTi8Uuvgs= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 074CF2C0A9 for <pacman-dev@lists.archlinux.org>; Thu, 6 Jul 2017 03:30:32 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [IPv6:2a00:1828:2000:547::2]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Thu, 6 Jul 2017 03:30:32 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id A253A4022C for <pacman-dev@lists.archlinux.org>; Thu, 6 Jul 2017 05:30:30 +0200 (CEST) Received: from localhost (a82-188.nat.uq.edu.au [130.102.82.188]) (using TLSv1.2 with cipher DHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: allan) by nymeria.archlinux.org (Postfix) with ESMTPSA id 6F8B6401DC for <pacman-dev@archlinux.org>; Thu, 6 Jul 2017 05:30:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=nymeria2; t=1499311830; bh=KfifLP2gDjHVfzCPpBcecL3jv1PY+WtHfkeAl+xCduk=; h=From:To:Subject:Date; b=fALUMtxygwFmQMTQAoibv4yAkKT7g4Ci5On1YVMaV9/TIfvXKpsZO6qzaD1154L5A 9CyxLPmP5zD/jVEh/MLMg0ks8rRCCdiaOQaaARJbE48Wy1DX/oa+RVMCjgGCrKoumj zzYiJHABtOaElcHEx/QfqyemQ57VEcAxi4YqJEQAXfL3FAxU51PeaNkmODdPNvbBVI QkHOd4tdZG9VF7a2vp6VVx+Sbl83O3mnstgY+fBkaX8ha7wttupXaWr5FtO+DR4o14 QvQMzDYkDXo8K3wC7dFHrY7QUnobAwZNVY4M4Xe6Trv5CMGuhpZ5NVVVxG+BgGI72C xr3UNFO3+qC/iMwWP5FXmBLk1gEq8tTKqwb77rpDs7ipfxrCtrRN1q6mNdJrCBL08D vwyvRB9L5bJHdaRQuiqd4tXkeWMqm39p2PZLSzsjlUPu2vzvxYaig4qPBJsS8ZHYrC 2JgJZx94yo5SJRRWqQJ1I+yMsyUKO2UQNIBYm9TUgrA4766kn6liyo2cO6TLETx5Rg KRbd2Jkswe3fZ/wlnLBO3+L1FCEvWs6wAdsXHAXblpmTCl3LGAXovYC38CphM1WHww Tp/AOJ35bVW0DKbaDuCW+I+hfJ/ZS0W+7UJg36hvDeXZriyFe3ZRm6uauG5zGbAJG3 GzdYSS/RejxAOFqBOiBvE4uA= From: Allan McRae <allan@archlinux.org> To: pacman-dev@archlinux.org Date: Thu, 6 Jul 2017 13:30:22 +1000 Message-Id: <20170706033022.17350-1-allan@archlinux.org> X-Mailer: git-send-email 2.13.2 Subject: [pacman-dev] [PATCH] makepkg: always write pkgbase X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.24 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> X-UID: 475 Status: X-Keywords: Content-Length: 796 |
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f9872355..90f52abe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -638,9 +638,7 @@ write_pkginfo() { printf "# using %s\n" "$(fakeroot -v)" write_kv_pair "pkgname" "$pkgname" - if (( SPLITPKG )) || [[ "$pkgbase" != "$pkgname" ]]; then - write_kv_pair "pkgbase" "$pkgbase" - fi + write_kv_pair "pkgbase" "$pkgbase" local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver"
There is little savings in only writing pkgbase when different to pkgname, and it makes determining the pkgbase by parsing .PKGINFO slightly easier. Lets just write it... Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)