From patchwork Mon May 3 08:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arch--- via arch-projects X-Patchwork-Id: 1918 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); Mon, 03 May 2021 08:09:21 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id CM56BLGvj2Aq5gAAK+/4rw (envelope-from ) for ; Mon, 03 May 2021 08:09:21 +0000 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 mail.archlinux.org (Postfix) with ESMTPS id 2AECF561392; Mon, 3 May 2021 08:09:20 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CE2DE2B76D; Mon, 3 May 2021 08:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1620029359; bh=JiDV4e1HEpCCVuvIS5WeUIF21t+4oQKXjwjJCH+e7IA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=My0nPBmgYiDLUz8G0ycW6uY2QvfR9FY0eVWo8ZZW9k/sQY/9JQbqbmVyXtsiuXpI+ lPHMbhG1yhDCrwmmZcz0SmLePfj7EWUlT97+uoA12zP/kELufEiiTsSY8upM8/Fh+i IMFYGijpGnEsXTSkobgquAuWI6sv9S3VrOhaYOllZovJP1d4iRmvM3Us8Oz7S6ZqrH s3wC14nIRwIGj/W5ANT7c6v2OAqS4L1JUNud9AnICGpByR9gbrL3ldHBxOeop5tbRZ Q/peuomjG5DPqZG9oVZ8euJCniTpt2LJEcntSOM0zQvmJeC+HqpcUsFzEs0S1m6saK t/o8YnII0LHIkwJvb6elKh+6ET1SQ3dd60Crz5wN9cT7j/3GbCa89bqU08sJhuvTBf Z0JQ+4NhbMIl3rqz8JG+SqLlCUsTKuALr/+poHQzoNuSsVxtFlwwysEUfdjzR0q/XU 1e0GBWAWCYj25MRR9eTzJYOfu6OwP0ldeXtkPh7bAUDyt6lnqe6z5xVp40fSyXBWV/ EYkSN9g43QG849wLqNm+yFls/z7xxP9BrayNqvF9Q50jfOmHG5KcxRbuFG9b/VmTI4 YTOzqheLqn0u38CDyT1x5f8E5QoF8sx3o15casuPpvhovQwUB/AYkDBpgGgB80HNkH eC0rHFVtwdFc3hb+Wm/RsrcI= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 309AB2B67C for ; Mon, 3 May 2021 08:09:17 +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.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01,RCVD_IN_MSPIKE_WL=-0.01, T_DMARC_POLICY_NONE=0.01 autolearn=failed autolearn_force=no version=3.4.6 X-Spam-BL-Results: [127.0.9.2] [127.0.0.19] Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 3 May 2021 08:09:17 +0000 (UTC) Received: from szilassi.eckner.net (szilassi.eckner.net [IPv6:2a03:4000:2a:1bc::1]) (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) by mail.archlinux.org (Postfix) with ESMTPS id 791DB561390 for ; Mon, 3 May 2021 08:09:15 +0000 (UTC) Original-Subject: [namcap] [PATCH] VCS requirements can be satisfied by depends=(...) Original-From: arch@eckner.net Original-Cc: Erich Eckner Received-SPF: unknown (Address does not pass the Sender Policy Framework) SPF=HELO; sender=nlopc43.ioq.uni-jena.de; remoteip=2001:638:1558:8c70:d6be:d9ff:fe9c:1bda; remotehost=; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; Received-SPF: fail (Address does not pass the Sender Policy Framework) SPF=MAILFROM; sender=arch@eckner.net; remoteip=2001:638:1558:8c70:d6be:d9ff:fe9c:1bda; remotehost=; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; Received: from nlopc43.ioq.uni-jena.de ([2001:638:1558:8c70:d6be:d9ff:fe9c:1bda]) (AUTH: PLAIN erich@eckner.net, SSL: TLS1.3, 256bits, ECDHE_RSA_AES_256_GCM_SHA384) by szilassi.eckner.net with ESMTPSA id 0000000000B60423.00000000608FAFAA.0004CC58; Mon, 03 May 2021 10:09:13 +0200 To: arch-projects@archlinux.org Date: Mon, 3 May 2021 10:08:31 +0200 Message-Id: <20210503080830.3301532-1-arch@eckner.net> X-Mailer: git-send-email 2.31.1 Mime-Version: 1.0 Received-SPF: fail (Address does not pass the Sender Policy Framework) SPF=FROM; sender=arch@eckner.net; remoteip=2001:638:1558:8c70:d6be:d9ff:fe9c:1bda; remotehost=; helo=nlopc43.ioq.uni-jena.de; receiver=szilassi.eckner.net; X-Mime-Autoconverted: from 8bit to 7bit by courier 1.1 Subject: [arch-projects] [namcap] [PATCH] VCS requirements can be satisfied by depends=(...) X-BeenThere: arch-projects@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: arch--- via arch-projects From: arch--- via arch-projects Reply-To: Arch Linux projects development discussion Cc: arch@eckner.net, Erich Eckner Errors-To: arch-projects-bounces@lists.archlinux.org Sender: "arch-projects" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=My0nPBmg; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of arch-projects-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=arch-projects-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 2AECF561392 X-Spamd-Result: default: False [-3.61 / 15.00]; HAS_REPLYTO(0.00)[arch-projects@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2:c]; MV_CASE(0.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCVD_IN_DNSWL_MED(-0.40)[2a01:4f8:160:3033::2:from,95.216.189.61:received]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; FROM_NEQ_ENVFROM(0.00)[arch-projects@lists.archlinux.org,arch-projects-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; RCVD_COUNT_FIVE(0.00)[6]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org From: Erich Eckner "W: VCS source PKGBUILD needs additional makedepends 'git' to work properly" and co were too specific: It's sufficient to have the needed package in depends=(). So we should check makedepends=() and depends=() for needed packages. Signed-off-by: Erich Eckner --- Namcap/rules/makedepends.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index b319e7c..2923e32 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -71,11 +71,11 @@ class VCSMakedepends(PkgbuildRule): for v in protocols: d = vcs[v] - if 'makedepends' not in pkginfo: - missing.append(d) + if 'makedepends' in pkginfo and d in pkginfo["makedepends"]: continue - if d not in pkginfo["makedepends"]: - missing.append(d) + if 'depends' in pkginfo and d in pkginfo["depends"]: + continue + missing.append(d) for i in missing: self.warnings.append(("missing-vcs-makedeps %s", i))