From patchwork Fri May 21 04:16:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 1923 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.19) for (single-drop); Fri, 21 May 2021 04:17:04 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id EM/FGUA0p2COwgkAK+/4rw (envelope-from ) for ; Fri, 21 May 2021 04:17:04 +0000 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 mail.archlinux.org (Postfix) with ESMTPS id DC16B5CC8C8; Fri, 21 May 2021 04:17:03 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 8D85A2C4FE; Fri, 21 May 2021 04:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1621570623; bh=A3z/Hkmxw0nTAaSw0F3CvFxgviuHuO7eBfopL+zPIus=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=L3YihPe5yftegplSCtWnStwkTlCFGF7jp45KTsWLJqsI9ZzVcr20WE5h8ix/HYD1P QLhxsl2tWeJv916wPlpzEUqTV9SIsRbXeMOQpJlEy3K7GfbvZxU7szhIUeiUE95JeK BIyKRw8/iwLWLEo+YvAthqEykIF87iWu6SKrVacrcfjVaAJjmz+8NeBa39HP3SejZN fLUeoUsaDS3tsiWtjRUsTmy3fAQdUhqC14e3zkmuQUXBjn4gcQvWFXjO05/6B/k2RL VMtkKLTBX3KJKvtBD4m7FFCiTrEnFd1IRZLp9sXRgsNpdpAn8lxa2MgRCSQbE5fi7q K3oeK2sip/KK6XRDB5qbVbwqDlDHk5sZPegcywHulWtzAAf2lYgLEx/O47E1ezQg39 CoteihA6qQd8Y626JZZwmicnSbqzhZbPaacok5ysg+DGco5Nitt5o5zCYD381l0dCx DABY5ljEI5vQx+3DNrtlw61t57J0LidQbSehmYCq5lqlWIEcNv/gdHdSYq4Btg3vC+ FwSug8lhZ4AwJeM9Iuq1G1mx8vznsmiLZI0+I/VKw66jYOtUD8081rebSTLaRxkOTN jgmlR7LJu+ospQMaN+T6BsVvRsh5jnj8VkE3ohnvjLiW7aXjLKBXGhVD4uij2/AjY/ baaogEdI7Hy0CumkzSKBQfhI= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5FAEB2B76C for ; Fri, 21 May 2021 04:17:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,T_DMARC_POLICY_NONE=0.01 autolearn=failed autolearn_force=no version=3.4.6 X-Spam-BL-Results: [127.0.9.2] Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 21 May 2021 04:17:01 +0000 (UTC) To: pacman-contrib@lists.archlinux.org Subject: [pacman-contrib] [PATCH] updpkgsums: don't try to add nonexistent checksums Date: Fri, 21 May 2021 00:16:41 -0400 Message-Id: <20210521041641.3656943-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Eli Schwartz via pacman-contrib From: Eli Schwartz Reply-To: Discussion list for pacman-contrib development Cc: Eli Schwartz Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=L3YihPe5; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 5.9.250.164 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: DC16B5CC8C8 X-Spamd-Result: default: False [-0.11 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:5.9.250.164:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_COUNT_THREE(0.00)[4]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_IN_DNSWL_MED(-0.40)[5.9.250.164:from,95.216.189.61:received]; MAILLIST(-0.20)[mailman]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:5.9.0.0/16, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In the event there are no sources, there won't be sums either. awk won't find any to remove and replace inline, so it tries to print "" at the end of the file, and merely adds superfluous newlines. Abort early instead, since updpkgsums cannot be expected to process such a file. Signed-off-by: Eli Schwartz --- src/updpkgsums.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in index 41965f5..e5dbd2b 100644 --- a/src/updpkgsums.sh.in +++ b/src/updpkgsums.sh.in @@ -99,6 +99,11 @@ newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT sumtypes=$(IFS='|'; echo "${known_hash_algos[*]}") newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums' + +if [[ -z $newsums ]]; then + die "$buildfile does not contain sources to update" +fi + awk -v sumtypes="$sumtypes" -v newsums="$newsums" ' $0 ~"^[[:blank:]]*(" sumtypes ")sums(_[^=]+)?=", $0 ~ "\\)[[:blank:]]*(#.*)?$" { if (!w) {