[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/fields: Fix /git/git/ error in canon git urls



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit e6b9c5087b02c3443892d436a08793dbf0e267cb
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 20 11:51:11 2017 +0000

    c/fields: Fix /git/git/ error in canon git urls
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/fields.pm | 4 ++--
 debian/changelog | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/checks/fields.pm b/checks/fields.pm
index 336aa34..f44905e 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -173,11 +173,11 @@ my %VCS_CANONIFY = (
           ) {
             $_[1] = 'vcs-git-uses-invalid-user-uri';
         }
-        $_[0] =~ s{https?\Q://git.debian.org/\E}
+        $_[0] =~ s{https?\Q://git.debian.org/\E(?:git/?)?}
                   {https://anonscm.debian.org/git/};
         $_[0] =~ s{https?\Q://anonscm.debian.org/git/git/\E}
                   {https://anonscm.debian.org/git/};
-        $_[0] =~ s{\Qgit://git.debian.org/\E}
+        $_[0] =~ s{\Qgit://git.debian.org/\E(?:git/?)?}
                   {https://anonscm.debian.org/git/};
         $_[0] =~ s{\Qgit://anonscm.debian.org/git/\E}
                   {https://anonscm.debian.org/git/};
diff --git a/debian/changelog b/debian/changelog
index cdec516..19d1a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ lintian (2.5.51) UNRELEASED; urgency=medium
       on a collection.
   * checks/fields.pm:
     + [BR] Enforce naming convention for debug package.  (Closes: #645455).
+    + [NT] Avoid proposing "/git/git/" as a part of the canonical URL for
+      anonscm.debian.org.  Thanks to Andreas Beckmann for spotting the
+      bug.  (Closes: #851215)
   * checks/files.pm:
     + [BR] Do not report duplicates for package-installs-apt-preferences
       and package-installs-apt-sources.  (Closes: #814521).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: