[lintian] 01/01: checks/fields.pm: Accept and recommend new vcs-mtn mtn:// uri format. (Closes: #878798)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 678ea00d7b63997e22d09735bdc66ea7ea04ad0d
Author: Nicolas Boulenguez <nicolas@debian.org>
Date: Sun Oct 15 00:21:59 2017 +0200
checks/fields.pm: Accept and recommend new vcs-mtn mtn:// uri format. (Closes: #878798)
Signed-off-by: Chris Lamb <lamby@debian.org>
---
checks/fields.pm | 7 ++++---
debian/changelog | 3 +++
t/tests/fields-uncanonical-vcs-fields/debian/debian/control.in | 2 +-
t/tests/fields-vcs-fields/desc | 2 +-
t/tests/fields-vcs-fields/tags | 1 +
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/checks/fields.pm b/checks/fields.pm
index 549df72..3a5de15 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -114,8 +114,8 @@ my %VCS_EXTRACT = (
# git uri followed by optional " -b " + branchname:
git => sub { return shift =~ /^(.+?)(?:\s+-b\s+(\S*))?$/;},
svn => sub { return @_;},
- # that's a hostname followed by a module name:
- mtn => sub { return shift =~ /^(.+?)\s+(\S+)$/;},
+ # New "mtn://host?branch" uri or deprecated "host branch".
+ mtn => sub { return shift =~ /^(.+?)(?:\s+\S+)?$/;},
);
my %VCS_CANONIFY = (
browser => sub {
@@ -195,7 +195,7 @@ my %VCS_RECOMMENDED_URIS = (
hg => qr;^https?://;,
git => qr;^(?:git|https?|rsync)://;,
svn => qr;^(?:svn|(?:svn\+)?https?)://;,
- mtn => qr;^[\w.-]+$;,
+ mtn => qr;^mtn://;,
);
my %VCS_VALID_URIS = (
arch => qr;^https?://;,
@@ -204,6 +204,7 @@ my %VCS_VALID_URIS = (
hg => qr;^ssh://;,
git => qr;^(?:git\+)?ssh://|^[\w.]+@[a-zA-Z0-9.]+:[/a-zA-Z0-9.];,
svn => qr;^(?:svn\+)?ssh://;,
+ mtn => qr;^[\w.-]+$;,
);
# Python development packages that are used almost always just for building
diff --git a/debian/changelog b/debian/changelog
index d4a9d4c..17ea642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ lintian (2.5.56) UNRELEASED; urgency=medium
+ [NT] Avoid useless-autoreconf-build-depends for autotools-dev when
the autotools-dev tooling is used in debian/rules.
(Closes: #871711)
+ * checks/fields.pm:
+ + [CL] Apply patch from Nicolas Boulenguez to accept and recommend the
+ new vcs-mtn mtn:// uri format. (Closes: #878798)
* checks/watch-file.pm:
+ [CL] Include the offending URI in debian-watch-uses-insecure-uri
output, not the line number.
diff --git a/t/tests/fields-uncanonical-vcs-fields/debian/debian/control.in b/t/tests/fields-uncanonical-vcs-fields/debian/debian/control.in
index de674de..377fec8 100644
--- a/t/tests/fields-uncanonical-vcs-fields/debian/debian/control.in
+++ b/t/tests/fields-uncanonical-vcs-fields/debian/debian/control.in
@@ -6,7 +6,7 @@ Standards-Version: {$standards_version}
Build-Depends: {$build_depends}
Vcs-Browser: https://svn.debian.org/wsvn/foobar/trunk?foo=bar;op=log;something=else
Vcs-Svn: svn://svn.debian.org/svn/foobar/trunk
-Vcs-Mtn: www.example.org org.debian.foobar
+Vcs-Mtn: mtn://www.example.org?org.debian.foobar
Vcs-Hg: http://hg.debian.org/hg/foobar/pkg/foobar
Vcs-Git: git://git.debian.org/~djpig/foobar.git -b master
Vcs-Cvs: :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/foobar module
diff --git a/t/tests/fields-vcs-fields/desc b/t/tests/fields-vcs-fields/desc
index a4a0dd2..d6bf5c4 100644
--- a/t/tests/fields-vcs-fields/desc
+++ b/t/tests/fields-vcs-fields/desc
@@ -5,9 +5,9 @@ Test-Against:
vcs-field-bitrotted
vcs-field-has-unexpected-spaces
vcs-field-not-canonical
- vcs-field-uses-not-recommended-uri-format
vcs-field-uses-unknown-uri-format
vcs-git-uses-invalid-user-uri
Test-For:
vcs-field-uses-insecure-uri
+ vcs-field-uses-not-recommended-uri-format
vcs-browser-links-to-empty-view
diff --git a/t/tests/fields-vcs-fields/tags b/t/tests/fields-vcs-fields/tags
index d7fe58e..5065151 100644
--- a/t/tests/fields-vcs-fields/tags
+++ b/t/tests/fields-vcs-fields/tags
@@ -2,3 +2,4 @@ I: fields-vcs-fields source: vcs-field-uses-insecure-uri vcs-bzr nosmart+http://
I: fields-vcs-fields source: vcs-field-uses-insecure-uri vcs-cvs :pserver:anonymous@anonscm.debian.org:/cvs/foobar module
I: fields-vcs-fields source: vcs-field-uses-insecure-uri vcs-svn svn://anonscm.debian.org/foobar/trunk
W: fields-vcs-fields source: vcs-browser-links-to-empty-view https://anonscm.debian.org/viewvc/foobar/trunk?rev=0&sc=0
+W: fields-vcs-fields source: vcs-field-uses-not-recommended-uri-format vcs-mtn www.example.org org.debian.foobar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: