[libconfig-model-dpkg-perl] 01/01: Vcs-Git param: fixed git url substitution

dod at debian.org dod at debian.org
Thu Jan 23 06:39:03 UTC 2014


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

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit dff65eac28ada6a0db4e9c3dcbfb816944051b63
Author: Dominique Dumont <dod at debian.org>
Date:   Thu Jan 23 07:38:52 2014 +0100

    Vcs-Git param: fixed git url substitution
---
 lib/Config/Model/models/Dpkg/Control/Source.pl | 3 ++-
 t/dependency-check.t                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Config/Model/models/Dpkg/Control/Source.pl b/lib/Config/Model/models/Dpkg/Control/Source.pl
index 888b417..6361f60 100644
--- a/lib/Config/Model/models/Dpkg/Control/Source.pl
+++ b/lib/Config/Model/models/Dpkg/Control/Source.pl
@@ -295,7 +295,8 @@ The information is meant to be useful for a user knowledgeable in the given Vers
         'warn_unless' => {
           'debian-uri' => {
             'code' => '!defined $_ or ! /debian.org/ or m{^http://anonscm.debian.org/git/(?!git/)} or m{^git://anonscm.debian.org/(?!git/)} ;',
-            'fix' => 's!http://[\\w\\.-]+/(git/)*!http://anonscm.debian.org/git/!; s!git://[\\w\\.-]+/!git://anonscm.debian.org/!;',
+            'fix' => 's!http://[\\w\\.-]+/(git/)*!http://anonscm.debian.org/git/!;
+s!git://[\\w\\.-]+/(git/)?!git://anonscm.debian.org/!;',
             'msg' => 'URL to debian system is not the recommended one'
           }
         }
diff --git a/t/dependency-check.t b/t/dependency-check.t
index fa36f64..9026e7f 100644
--- a/t/dependency-check.t
+++ b/t/dependency-check.t
@@ -338,7 +338,7 @@ my @vcs_tests = (
     [ 'Vcs-Bzr',     'http://baz.debian.org/','http://anonscm.debian.org/bzr/'],
     [ 'Vcs-Cvs',     'svn at cvs.alioth.debian.org:/cvsroot/','svn at anonscm.debian.org:/cvs/'],
     [ 'Vcs-Git',     'http://foo.debian.org/git/bar.git','http://anonscm.debian.org/git/bar.git'],
-    [ 'Vcs-Git',     'git://foo.debian.org/','git://anonscm.debian.org/'],
+    [ 'Vcs-Git',     'git://foo.debian.org/git/bar.git','git://anonscm.debian.org/bar.git'],
     [ 'Vcs-Hg',      'http://foo.debian.org/hg/foo','http://anonscm.debian.org/hg/foo'],
     [ 'Vcs-Svn',     'svn://foo.debian.org/svn/foo','svn://anonscm.debian.org/foo'],
 );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git



More information about the Pkg-perl-cvs-commits mailing list