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

[SCM] Debian package checker branch, master, updated. 2.5.3-59-g3b665a0



The following commit has been merged in the master branch:
commit 3b665a0301bec5730b30e4fde3b3d1b33a72e999
Author: Jakub Wilk <jwilk@debian.org>
Date:   Wed Oct 12 12:55:21 2011 +0200

    Fixed more false-positives with DEP-5 URIs
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/source-copyright b/checks/source-copyright
index e36e954..7d8c813 100644
--- a/checks/source-copyright
+++ b/checks/source-copyright
@@ -103,11 +103,11 @@ if (m{
         }
         elsif ($uri =~ s,^http://svn\.debian\.org/wsvn/dep/web/deps/dep5\.mdwn\b,,) {
             $version = '0+svn';
-            $uri =~ m,^\?(?:\S+&)?rev=(\d+)(?:&\S+)?$, and $version = "$version~$1";
+            $uri =~ m,^\?(?:\S+[&;])?rev=(\d+)(?:[&;]\S+)?$, and $version = "$version~$1";
         }
         elsif ($uri =~ s,^http://(?:svn|anonscm)\.debian\.org/viewvc/dep/web/deps/dep5\.mdwn\b,,) {
             $version = '0+svn';
-            $uri =~ m,^\?(?:\S+&)?(?:pathrev|revision|rev)=(\d+)(?:&\S+)?$, and $version = "$version~$1";
+            $uri =~ m,^\?(?:\S+[&;])?(?:pathrev|revision|rev)=(\d+)(?:[&;]\S+)?$, and $version = "$version~$1";
         }
         elsif ($uri =~ m,^http://www\.debian\.org/doc/(?:packaging-manuals/)?copyright-format/(\d+\.\d+)$,) {
             $version = $1;

-- 
Debian package checker


Reply to: