From patchwork Tue Mar 17 09:30:44 2020 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: 1562 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 EFE1F17A6F4A2 for ; Tue, 17 Mar 2020 09:31:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=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,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 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 ; Tue, 17 Mar 2020 09:31:15 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id AF5F81A2AD7A18; Tue, 17 Mar 2020 09:31:12 +0000 (UTC) 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) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 102B11A2AD7A10; Tue, 17 Mar 2020 09:31:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1584437472; bh=eWz12CAS6L0dL2z06yNGH0pcAiOquc8RLGBdyjqFKVU=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=v3g7MVuCuSe3a8/pCK4TLhuHYp6fwV6/quItcqlC/5yFYo7e6SfyXqf0NWjLnVAo4 bqniF3agGV9FFS6iQ1MUOu9zOJFZPeT2g6H8c+Y392L1m+XhqZLb6ZMR3UnG9x8xae LOPTW3AZg4a6Va8rHIq5Q53WjjS07WuOe5BwfVgMoeVh1U3O1IXH/bNToGm+L4DqTe am7Tcws7j/gKMty/NQ+kn9jw/OlS1ZQZCkMrGAGCMhOHTl73OrDl0D34R4CxGvuI5w +2l53rJOkFLnjxgZjxJJIcDye2syneAPxyUfbsH2jm689+qEaDnlLpSSmDu3+HyrPU aq+5EdEBLr+AXO6giuwiWm8KJMoRlA3n1OGZfOS2MllHMzffba5Xwz5UFBjK4Y+f3a 3uq6Hay3KZLBz+euF40fLeVxcXMXTHVxPusIHI10RqCtHu7oBtvi8xck76BkgM84/i j80wUTexCVE7JeGkurIeRMIVXRg5kpq2yWuDGPP2vmrepF7dY+5o3N609FiQCqp100 zuVg+PLxUHTkn0KqWu0YFglxibypJ9i2du06IZy0HHZFyr6FydFT6yJWHs1mZTRylU 3WVzfY6cmHyQ+EbwwXftNEtN2r5Aix/fHBen4x3sw/4NcxBKBbW3/uc29wUojLfxrw mmbxUYv0U4BRl/VyIcsjhyXI= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E86152A8ED; Tue, 17 Mar 2020 09:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1584437471; bh=eWz12CAS6L0dL2z06yNGH0pcAiOquc8RLGBdyjqFKVU=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=koqk4SNnl//eEDAS4YUy+OwT56qjkbvxfI6mTxkH5lMeKY82ej5mgA1/GKjfAUpyS a82Os0in6ZOq9leTef2+1Rj9jAL6MqJOkearzFQj8ksY9ebu6foI45BZVpni+Suxqc +qRe7vBEV8cvVI24DcFfE+fT+iDvkItxEQ51Fs4YKxYvoCoPqfTauB5RRb17SBn3mc U8IhiJDrIyXrl8ja/bfzMuJkSUdy6xziDvDgx4Ne/2eEc/tbznV19lQ/RxOqx52H0k FRuUeTYRiV5g6O05GhISITyAF5q1YBar6VO9CONjP94MM2bDvTMTk60KFY8jEN7nJl ozc3Fw11uHqIyVsP2+Vl4V2k7hv9Y+YvjpjkdhfPDaZJBZm3yurTIea4EeFlafVNY0 4cMYY1bCowTnsCvaZ231Zc+4TBuP0AoxSdOgA+sBtJgqJ8NVjpMd8mXFSMibZrQ2eA kbhVOn2IwnomeL92Oi9Q1RvEbhq6ZblIo+NVqBzZjpngdMW8Kvh3zxMfC704CTjbFu CAErzlKi5pVCkLHPyN8pjzNDWcbCz/CSn1+HELC6q1WSV5CUDT4Sjg/kYWp2ox5I+L 6tKOqZHQW9s5qA3QinMZIQMkwZLY5dtvmlDZFbvIZdd8pbdpkidaGQu/10NwfItNwZ smjB0QFi2jAECPcmMCAz5xuE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 0830629D01 for ; Tue, 17 Mar 2020 09:31:09 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 17 Mar 2020 09:31:09 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 72CBB1A2AD7A0A; Tue, 17 Mar 2020 09:31:04 +0000 (UTC) Received: from localhost (jolteon.felixc.at [45.131.68.110]) (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: felixonmars) by orion.archlinux.org (Postfix) with ESMTPSA id E69CC1A2AD7A09; Tue, 17 Mar 2020 09:31:03 +0000 (UTC) To: arch-projects@archlinux.org, felixonmars@archlinux.org Date: Tue, 17 Mar 2020 17:30:44 +0800 Message-Id: <20200317093044.3789897-1-felixonmars@archlinux.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [arch-projects] [namcap] [PATCH] Don't report missing-vcs-makedeps when it is in depends 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: Felix Yan via arch-projects Reply-To: Arch Linux projects development discussion Cc: Felix Yan Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" Currently a PKGBUILD warning is shown when the package depends on git instead of makedepends on it. Since we also have the redundant_makedepends rule we should not write it again in makedepends. This patch checkes depends array too so this warning could be suppressed. --- Namcap/rules/makedepends.py | 2 ++ Namcap/tests/pkgbuild/test_makedepends.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 53676c2..8b938a0 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -68,6 +68,8 @@ class VCSMakedepends(PkgbuildRule): for v in protocols: d = vcs[v] + if 'depends' in pkginfo and d in pkginfo["depends"]: + continue if 'makedepends' not in pkginfo: missing.append(d) continue diff --git a/Namcap/tests/pkgbuild/test_makedepends.py b/Namcap/tests/pkgbuild/test_makedepends.py index d443b2b..73a3ba2 100644 --- a/Namcap/tests/pkgbuild/test_makedepends.py +++ b/Namcap/tests/pkgbuild/test_makedepends.py @@ -111,4 +111,12 @@ package() { self.assertEqual(r.warnings, []) self.assertEqual(r.infos, []) + def test_example3(self): + # Example 3 + r = self.run_on_pkg(self.pkgbuild1 + 'depends=(bzr git mercurial)') + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, + [("missing-vcs-makedeps %s", 'subversion')]) + self.assertEqual(r.infos, []) + # vim: set ts=4 sw=4 noet: