[licensecheck] 12/112: Improve non-version descriptor matching.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository licensecheck.

commit 40b0028daabd806d0d41ceaa706b416e010f61ea
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 19 18:48:01 2016 +0200

    Improve non-version descriptor matching.
---
 lib/App/Licensecheck.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 99d8ecc..7e64f22 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -472,7 +472,7 @@ sub parse_license
 
 	# LGPL
 	given ($licensetext) {
-		when ( /(are made available|(is free software.? )?you can redistribute (it|them) and[ \/]or modify (it|them)|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i ) {
+		when ( /(are made available|(is free software.? )?you can redistribute (it|them) and[ \/]or modify (it|them)|is licensed) under the terms of (version \S+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i ) {
 			$license = "LGPL$gplver$extrainfo $license";
 			push @spdx_license, $gen_spdx->('LGPL');
 		}
@@ -492,7 +492,7 @@ sub parse_license
 
 	# GPL
 	given ($licensetext) {
-		when ( /(is free software.? )?you (can|may) redistribute (it|them) and[ \/]or modify (it|them) under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the GNU General Public License/i ) {
+		when ( /(is free software.? )?you (can|may) redistribute (it|them) and[ \/]or modify (it|them) under the terms of (?:version \S+ (?:\(?only\)? )?of )?the GNU General Public License/i ) {
 			$license = "GPL$gplver$extrainfo $license";
 			push @spdx_license, $gen_spdx->('GPL');
 		}
@@ -635,7 +635,7 @@ sub parse_license
 
 	# CECILL
 	given ($licensetext) {
-		when ( /under the terms of the CeCILL-([^ ]+) / ) {
+		when ( /under the terms of the CeCILL-(\S+) / ) {
 			$gen_license->( 'CeCILL', $1 );
 		}
 		when ( /under the terms of the CeCILL / ) {

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