[devscripts] 01/01: licensecheck: fixed Artistic v2 regexp (Tx osamu)

[dod at debian.org]

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

dod pushed a commit to branch master
in repository devscripts.

commit 357e8824025b3f26280771a0c46bb5c0202b475d
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Dec 20 20:21:47 2015 +0100

    licensecheck: fixed Artistic v2 regexp (Tx osamu)
---
 scripts/licensecheck.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 221cb87..f4a627a 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -666,7 +666,10 @@ sub parselicense {
         $license = "MPL (v$1) $license";
     }
 
-    if ($licensetext =~ /(?:^|(?:This is free software, licensed|Released) under (?:the terms of )?)?[Tt]he Artistic License ([v\d.]+)/) {
+    # match when either:
+    # - the text *begins* with "The Artistic license v2.0" which is (hopefully) the actual artistic license v2.0 text.
+    # - a license grant is found. i.e something like "this is free software, licensed under the artistic license v2.0"
+   if ($licensetext =~ /(?:^|(?:This is free software, licensed|Released) under (?:the terms of )?)[Tt]he Artistic License ([v\d.]+)/) {
 	$license = "Artistic (v$1) $license";
     }
 

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