@@ -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)
@@ -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:
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@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(-)