- Arch-projects - lists.archlinux.org

[arch-projects] [namcap] [PATCH v3] makedepends: Make VCS matching more robust
by Michael Straube 02 Dec '18

02 Dec '18

If a VCS source is renamed using the "::" syntax the makedepends are not detected. If there are files starting with <name of VCS binary> in the source array false positives are produced. See the gitlab package for example. Make the matching more robust to avoid such issues. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- v1 -> v2 Make it also work for e.g. git:// v2 -> v3 Return early if no vcs sources. Namcap/rules/makedepends.py | 15 ++++++++++++--- Namcap/tests/pkgbuild/test_makedepends.py | 15 +++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 2a0ceaa..53676c2 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -54,10 +54,19 @@ class VCSMakedepends(PkgbuildRule): 'svn' : 'subversion', } missing = [] + protocols = set() - for v in vcs: - if not any(s.startswith(v) for s in pkginfo["source"]): - continue + for s in pkginfo["source"]: + p = s.split("::", 1)[-1] + p = p.split("://", 1)[0] + p = p.split("+", 1)[0] + if p in vcs: + protocols.add(p) + + if not protocols: + return + + for v in protocols: d = vcs[v] if 'makedepends' not in pkginfo: missing.append(d) diff --git a/Namcap/tests/pkgbuild/test_makedepends.py b/Namcap/tests/pkgbuild/test_makedepends.py index 78c476a..d443b2b 100644 --- a/Namcap/tests/pkgbuild/test_makedepends.py +++ b/Namcap/tests/pkgbuild/test_makedepends.py @@ -76,10 +76,10 @@ depends=() makedepends=() license=('GPL') options=('!libtool') -source=(bzr+https://ftp.example.com/pub/mypackage - git+https://ftp.example.com/pub/mypackage - hg+https://ftp.example.com/pub/mypackage - svn+https://ftp.example.com/pub/mypackage) +source=(name::bzr+https://example.com/pub/mypackage + name::git://example.com/pub/mypackage + hg+https://example.com/pub/mypackage + svn://example.com/pub/mypackage) md5sums=('abcdefabcdef12345678901234567890') build() { @@ -104,4 +104,11 @@ package() { set(("missing-vcs-makedeps %s", i) for i in makedeps)) self.assertEqual(r.infos, []) + def test_example2(self): + # Example 2 + r = self.run_on_pkg(self.pkgbuild1 + 'source=(gitsomething)') + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, []) + self.assertEqual(r.infos, []) + # vim: set ts=4 sw=4 noet: -- 2.19.2

1 0

[arch-projects] [namcap] [PATCH v2] makedepends: Make VCS matching more robust
by Michael Straube 02 Dec '18

02 Dec '18

If a VCS source is renamed using the "::" syntax the makedepends are not detected. If there are files starting with <name of VCS binary> in the source array false positives are produced. See the gitlab package for example. Make the matching more robust to avoid such issues. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- v1 -> v2 Make it also work for e.g. git:// Namcap/rules/makedepends.py | 10 +++++++++- Namcap/tests/pkgbuild/test_makedepends.py | 15 +++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 2a0ceaa..65747c4 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -54,9 +54,17 @@ class VCSMakedepends(PkgbuildRule): 'svn' : 'subversion', } missing = [] + protocols = set() + + for s in pkginfo["source"]: + p = s.split("::", 1)[-1] + p = p.split("://", 1)[0] + p = p.split("+", 1)[0] + if p in vcs: + protocols.add(p) for v in vcs: - if not any(s.startswith(v) for s in pkginfo["source"]): + if not v in protocols: continue d = vcs[v] if 'makedepends' not in pkginfo: diff --git a/Namcap/tests/pkgbuild/test_makedepends.py b/Namcap/tests/pkgbuild/test_makedepends.py index 78c476a..d443b2b 100644 --- a/Namcap/tests/pkgbuild/test_makedepends.py +++ b/Namcap/tests/pkgbuild/test_makedepends.py @@ -76,10 +76,10 @@ depends=() makedepends=() license=('GPL') options=('!libtool') -source=(bzr+https://ftp.example.com/pub/mypackage - git+https://ftp.example.com/pub/mypackage - hg+https://ftp.example.com/pub/mypackage - svn+https://ftp.example.com/pub/mypackage) +source=(name::bzr+https://example.com/pub/mypackage + name::git://example.com/pub/mypackage + hg+https://example.com/pub/mypackage + svn://example.com/pub/mypackage) md5sums=('abcdefabcdef12345678901234567890') build() { @@ -104,4 +104,11 @@ package() { set(("missing-vcs-makedeps %s", i) for i in makedeps)) self.assertEqual(r.infos, []) + def test_example2(self): + # Example 2 + r = self.run_on_pkg(self.pkgbuild1 + 'source=(gitsomething)') + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, []) + self.assertEqual(r.infos, []) + # vim: set ts=4 sw=4 noet: -- 2.19.2

2 2

[arch-projects] [namcap] [PATCH] makedepends: Make VCS matching more robust
by Michael Straube 02 Dec '18

02 Dec '18

If a VCS source is renamed using the "::" syntax the makedepends are not detected. If there are files starting with <name of VCS binary> in the source array false positives are produced. See the gitlab package for example. Make the matching more robust to avoid such issues. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- Perhaps there is a more elegant way? Namcap/rules/makedepends.py | 2 +- Namcap/tests/pkgbuild/test_makedepends.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 2a0ceaa..710e969 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -56,7 +56,7 @@ class VCSMakedepends(PkgbuildRule): missing = [] for v in vcs: - if not any(s.startswith(v) for s in pkginfo["source"]): + if not any(s.split("::")[-1].startswith(v + '+') for s in pkginfo["source"]): continue d = vcs[v] if 'makedepends' not in pkginfo: diff --git a/Namcap/tests/pkgbuild/test_makedepends.py b/Namcap/tests/pkgbuild/test_makedepends.py index 78c476a..0309016 100644 --- a/Namcap/tests/pkgbuild/test_makedepends.py +++ b/Namcap/tests/pkgbuild/test_makedepends.py @@ -77,7 +77,7 @@ makedepends=() license=('GPL') options=('!libtool') source=(bzr+https://ftp.example.com/pub/mypackage - git+https://ftp.example.com/pub/mypackage + some_name::git+https://ftp.example.com/pub/mypackage hg+https://ftp.example.com/pub/mypackage svn+https://ftp.example.com/pub/mypackage) md5sums=('abcdefabcdef12345678901234567890') @@ -104,4 +104,11 @@ package() { set(("missing-vcs-makedeps %s", i) for i in makedeps)) self.assertEqual(r.infos, []) + def test_example2(self): + # Example 2 + r = self.run_on_pkg(self.pkgbuild1 + 'source=(gitsomething)') + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, []) + self.assertEqual(r.infos, []) + # vim: set ts=4 sw=4 noet: -- 2.19.2

2 2

[arch-projects] [namcap] [PATCH v2 1/3] Warn about makedepends already in depends
by Michael Straube 25 Nov '18

25 Nov '18

Add a rule that warns about make dependencies already listed as dependencies. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- v1 -> v2 Added patch that implements FS#58303 Warn about missing VCS make dependencies. Namcap/rules/__init__.py | 1 + Namcap/rules/makedepends.py | 41 +++++++++++++++++++++++++++++++++++++ namcap-tags | 1 + 3 files changed, 43 insertions(+) create mode 100644 Namcap/rules/makedepends.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index e8775a0..dcc950f 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -59,6 +59,7 @@ from . import ( carch, extravars, invalidstartdir, + makedepends, makepkgfunctions, missingvars, pkginfo, diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py new file mode 100644 index 0000000..48b1049 --- /dev/null +++ b/Namcap/rules/makedepends.py @@ -0,0 +1,41 @@ +# +# namcap rules - makedepends +# Copyright (C) 2018 Michael Straube <michael.straube(a)posteo.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from Namcap.ruleclass import * + +class RedundantMakedepends(PkgbuildRule): + """ + This rule checks for make dependencies that are already + included as dependencies. + """ + name = "makedepends" + description = "Check for redundant make dependencies" + + def analyze(self, pkginfo, pkgbuild): + redundant_makedeps = [] + + if 'makedepends' in pkginfo and 'depends' in pkginfo: + for d in pkginfo["makedepends"]: + if d in pkginfo["depends"]: + redundant_makedeps.append(d) + + for i in redundant_makedeps: + self.warnings.append(("redundant-makedep %s", i)) + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 2133c45..c253042 100644 --- a/namcap-tags +++ b/namcap-tags @@ -71,6 +71,7 @@ potential-non-fhs-man-page %s :: Potential non-FHS man page (%s) found. py-mtime-mtree-warning :: Found .py file unnoticeably newer than associated .pyc/pyo. py-mtime-tar-error :: Found .py file newer than associated .pyc/pyo. py-mtime-file-name %s :: Python script (%s) is newer than associated .pyc/pyo. +redundant-makedep %s :: Make dependency (%s) already included as dependency script-link-detected %s in %s :: Script link detected (%s) in file %s scrollkeeper-dir-exists %s :: Scrollkeeper directory exists (%s). Remember to not run scrollkeeper till post_{install,upgrade,remove}. site-ruby :: Found usr/lib/ruby/site_ruby in package, usr/lib/ruby/vendor_ruby should be used instead. -- 2.19.2

1 2

[arch-projects] [namcap] [PATCH] Add test for systemdlocation rule
by Michael Straube 21 Nov '18

21 Nov '18

Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- Namcap/tests/package/test_systemdlocation.py | 85 ++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Namcap/tests/package/test_systemdlocation.py diff --git a/Namcap/tests/package/test_systemdlocation.py b/Namcap/tests/package/test_systemdlocation.py new file mode 100644 index 0000000..c22dd5d --- /dev/null +++ b/Namcap/tests/package/test_systemdlocation.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# +# namcap tests - systemdlocation +# Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# + +import os +from Namcap.tests.makepkg import MakepkgTest +import Namcap.rules.systemdlocation + +class SystemdlocationTest(MakepkgTest): + pkgbuild = """ +pkgname=__namcap_test_systemdlocation +pkgver=1.0 +pkgrel=1 +pkgdesc="A package" +arch=('i686' 'x86_64') +url="http://www.example.com/" +license=('GPL') +depends=('glibc') +source=() +build() { + true +} +package() { + mkdir -p "${pkgdir}/etc/systemd/system" + touch "${pkgdir}/etc/systemd/system/systemdsomething" +} +""" + def test_systemdlocation_pkgname(self): + pkgfile = "systemd-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } + with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: + f.write(self.pkgbuild + "pkgname=systemd") + self.run_makepkg() + pkg, r = self.run_rule_on_tarball( + os.path.join(self.tmpdir, pkgfile), + Namcap.rules.systemdlocation.systemdlocationRule + ) + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, []) + self.assertEqual(r.infos, []) + + def test_systemdlocation_provides(self): + pkgfile = "__namcap_test_systemdlocation-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } + with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: + f.write(self.pkgbuild + "provides=(systemd)") + self.run_makepkg() + pkg, r = self.run_rule_on_tarball( + os.path.join(self.tmpdir, pkgfile), + Namcap.rules.systemdlocation.systemdlocationRule + ) + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, []) + self.assertEqual(r.infos, []) + + def test_systemdlocation(self): + pkgfile = "__namcap_test_systemdlocation-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } + with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: + f.write(self.pkgbuild) + self.run_makepkg() + pkg, r = self.run_rule_on_tarball( + os.path.join(self.tmpdir, pkgfile), + Namcap.rules.systemdlocation.systemdlocationRule + ) + self.assertEqual(r.errors, []) + self.assertEqual(r.warnings, [("systemd-location %s", + "etc/systemd/system/systemdsomething")]) + self.assertEqual(r.infos, []) + +# vim: set ts=4 sw=4 noet: -- 2.19.1

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.19 created. 1.19
by Jouke Witteveen 15 Nov '18

15 Nov '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The annotated tag, 1.19 has been created at 3c62e2c301346e968113520d09d12d6fc50846f9 (tag) tagging e0014041ad40c9385bb2c38aad2acae3c93eb512 (commit) replaces 1.18 tagged by Jouke Witteveen on Thu Nov 15 19:43:20 2018 +0100 - Log ----------------------------------------------------------------- Release 1.19 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAlvtvlAWHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFW2LCADI8l2HTUJHAZOqetzzMf43SpTb LFOLO59iIVA/Dz4lcaj9RruEom/hCglc9ZWkdYXQ6i5o83fRZf09JVior77Q1QpQ ghikQ86MpKooHWvwyNZeqXg4IxF2ZRHAuUgvQGze2RBf6Bi48MxvvJQG3t3gKhcW cviCL2c++ucsiZo8+KLD+5FBYPQ80UWQi/S2dcB0KBivbqbgHTigJyYMVWqkL0IH 7YiLfobxtTpZXHLuP8dwtQctWYcZCmzyz7PbtuzTjeCgxix1n3MMqFbtPrOwd/sw 0/TiOQ+rQ+No8561gnWGNGg0V3To+LVp0qxiAtJH3pIM3BX+SY3pnhZCAKaJ =xJBp -----END PGP SIGNATURE----- Christoph Hoopmann (1): mobile_ppp: do not try to determine the local IP from the hostname Jouke Witteveen (2): Support removable devices in automatic connections 1.19 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.18-3-ge001404
by Jouke Witteveen 15 Nov '18

15 Nov '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Network control utility based on systemd". The branch, master has been updated via e0014041ad40c9385bb2c38aad2acae3c93eb512 (commit) via d511899a3763c07420aa91b106354c8265c6e989 (commit) via f13c69f1136a9b03138744b53b368807029cbb2c (commit) from 9044d45d9d25c585f666e51f47da5559b165c837 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e0014041ad40c9385bb2c38aad2acae3c93eb512 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Nov 15 19:43:00 2018 +0100 1.19 release updates commit d511899a3763c07420aa91b106354c8265c6e989 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Nov 11 17:18:55 2018 +0100 Support removable devices in automatic connections commit f13c69f1136a9b03138744b53b368807029cbb2c Author: Christoph Hoopmann <christophhoopmann(a)gmail.com> Date: Wed Oct 17 10:20:52 2018 +0200 mobile_ppp: do not try to determine the local IP from the hostname Signed-off-by: Christoph Hoopmann <christophhoopmann(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 4 ++++ services/netctl-auto@.service | 3 ++- services/netctl-ifplugd@.service | 3 ++- src/lib/connections/mobile_ppp | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] Support removable devices in automatic connections
by Jouke Witteveen 11 Nov '18

11 Nov '18

--- services/netctl-auto@.service | 3 ++- services/netctl-ifplugd@.service | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/netctl-auto@.service b/services/netctl-auto@.service index 3e41744..aacf65c 100644 --- a/services/netctl-auto@.service +++ b/services/netctl-auto@.service @@ -1,6 +1,7 @@ [Unit] Description=Automatic wireless network connection using netctl profiles Documentation=man:netctl.special(7) +Requisite=multi-user.target BindsTo=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device network-pre.target Before=network.target @@ -14,4 +15,4 @@ ExecStop=/usr/bin/netctl-auto stop %I ExecStopPost=/usr/bin/netctl-auto clean %I [Install] -WantedBy=multi-user.target +WantedBy=sys-subsystem-net-devices-%i.device diff --git a/services/netctl-ifplugd@.service b/services/netctl-ifplugd@.service index 76993b9..82fd9c0 100644 --- a/services/netctl-ifplugd@.service +++ b/services/netctl-ifplugd@.service @@ -1,6 +1,7 @@ [Unit] Description=Automatic wired network connection using netctl profiles Documentation=man:netctl.special(7) +Requisite=multi-user.target BindsTo=sys-subsystem-net-devices-%i.device After=sys-subsystem-net-devices-%i.device network-pre.target @@ -9,4 +10,4 @@ NotifyAccess=all ExecStart=/usr/bin/ifplugd -i %I -r /etc/ifplugd/netctl.action -bfIns [Install] -WantedBy=multi-user.target +WantedBy=sys-subsystem-net-devices-%i.device -- 2.19.1

1 0

[arch-projects] [namcap] [PATCH] Add test for makepkgfunctions rule
by Michael Straube 02 Nov '18

02 Nov '18

Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- .../tests/pkgbuild/test_makepkgfunctions.py | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 Namcap/tests/pkgbuild/test_makepkgfunctions.py diff --git a/Namcap/tests/pkgbuild/test_makepkgfunctions.py b/Namcap/tests/pkgbuild/test_makepkgfunctions.py new file mode 100644 index 0000000..ac2601c --- /dev/null +++ b/Namcap/tests/pkgbuild/test_makepkgfunctions.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# +# namcap tests - makepkgfunctions +# Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# + +from Namcap.tests.pkgbuild_test import PkgbuildTest +import Namcap.rules.makepkgfunctions as module + +class NamcapMakepkgfunctionsTest(PkgbuildTest): + pkgbuild1 = """ +# Maintainer: Arch Linux <archlinux(a)example.com> +# Contributor: Arch Linux <archlinux(a)example.com> + +pkgname=mypackage +pkgver=1.0 +pkgrel=1 +pkgdesc="A package" +arch=('i686' 'x86_64') +url="http://www.example.com/" +license=('GPL') +depends=('glibc') +options=('!libtool') +source=(ftp://ftp.example.com/pub/mypackage-0.1.tar.gz) +md5sums=('abcdefabcdef12345678901234567890') + +build() { + msg "some text" + msg2 "some text" + warning "some text" + error "some text" + plain "some text" +} + +package() { + true +} +""" + test_valid = PkgbuildTest.valid_tests + + def preSetUp(self): + self.rule = module.package + + def test_example1(self): + bad_calls = ['msg', 'msg2', 'warning', 'error', 'plain'] + r = self.run_on_pkg(self.pkgbuild1) + self.assertEqual(r.errors, []) + self.assertEqual(set(r.warnings), + set(("makepkg-function-used %s", i) for i in bad_calls)) + self.assertEqual(r.infos, []) + +# vim: set ts=4 sw=4 noet: -- 2.19.1

1 0

[arch-projects] [namcap] [PATCH 1/2] Warn about makedepends already in depends
by Michael Straube 31 Oct '18

31 Oct '18

Add a rule that warns about make dependencies already listed as dependencies. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- Namcap/rules/__init__.py | 1 + Namcap/rules/makedepends.py | 41 +++++++++++++++++++++++++++++++++++++ namcap-tags | 1 + 3 files changed, 43 insertions(+) create mode 100644 Namcap/rules/makedepends.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index e8775a0..dcc950f 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -59,6 +59,7 @@ from . import ( carch, extravars, invalidstartdir, + makedepends, makepkgfunctions, missingvars, pkginfo, diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py new file mode 100644 index 0000000..48b1049 --- /dev/null +++ b/Namcap/rules/makedepends.py @@ -0,0 +1,41 @@ +# +# namcap rules - makedepends +# Copyright (C) 2018 Michael Straube <michael.straube(a)posteo.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from Namcap.ruleclass import * + +class RedundantMakedepends(PkgbuildRule): + """ + This rule checks for make dependencies that are already + included as dependencies. + """ + name = "makedepends" + description = "Check for redundant make dependencies" + + def analyze(self, pkginfo, pkgbuild): + redundant_makedeps = [] + + if 'makedepends' in pkginfo and 'depends' in pkginfo: + for d in pkginfo["makedepends"]: + if d in pkginfo["depends"]: + redundant_makedeps.append(d) + + for i in redundant_makedeps: + self.warnings.append(("redundant-makedep %s", i)) + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 2133c45..c253042 100644 --- a/namcap-tags +++ b/namcap-tags @@ -71,6 +71,7 @@ potential-non-fhs-man-page %s :: Potential non-FHS man page (%s) found. py-mtime-mtree-warning :: Found .py file unnoticeably newer than associated .pyc/pyo. py-mtime-tar-error :: Found .py file newer than associated .pyc/pyo. py-mtime-file-name %s :: Python script (%s) is newer than associated .pyc/pyo. +redundant-makedep %s :: Make dependency (%s) already included as dependency script-link-detected %s in %s :: Script link detected (%s) in file %s scrollkeeper-dir-exists %s :: Scrollkeeper directory exists (%s). Remember to not run scrollkeeper till post_{install,upgrade,remove}. site-ruby :: Found usr/lib/ruby/site_ruby in package, usr/lib/ruby/vendor_ruby should be used instead. -- 2.19.1

1 1