[licensecheck] 08/112: Tighten regexes: Treat affero as alternative (not prefix) to GPL prefixes lesser and library.

Jonas Smedegaard dr at jones.dk
Fri Nov 25 22:01:38 UTC 2016


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

js pushed a commit to branch master
in repository licensecheck.

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

    Tighten regexes: Treat affero as alternative (not prefix) to GPL prefixes lesser and library.
---
 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 b9a3990..c2358f5 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -383,15 +383,15 @@ sub parse_license
 			$gplver = " (v$1 or v$2)";
 			@spdx_gplver = ( $1, $2 );
 		}
-		when ( /version (\d+(?:\.\d+)*)[.,]? (?:\(?only\)?.? )?(?:of the GNU (Affero )?(Lesser |Library )?General Public License )?(as )?published by the Free Software Foundation/i ) {
+		when ( /version (\d+(?:\.\d+)*)[.,]? (?:\(?only\)?.? )?(?:of the GNU (Affero |Lesser |Library )?General Public License )?(as )?published by the Free Software Foundation/i ) {
 			$gplver      = " (v$1)";
 			@spdx_gplver = ($1)
 		}
-		when ( /GNU (?:Affero )?(?:Lesser |Library )?General Public License (?:as )?published by the Free Software Foundation[;,] version (\d+(?:\.\d+)*)[.,]? /i ) {
+		when ( /GNU (?:Affero |Lesser |Library )?General Public License (?:as )?published by the Free Software Foundation[;,] version (\d+(?:\.\d+)*)[.,]? /i ) {
 			$gplver      = " (v$1)";
 			@spdx_gplver = ($1);
 		}
-		when ( /GNU (?:Affero )?(?:Lesser |Library )?General Public License ?(?:[(),GPL]+) ?version (\d+(?:\.\d+)*)[ \.]/i ) {
+		when ( /GNU (?:Affero |Lesser |Library )?General Public License ?(?:[(),GPL]+) ?version (\d+(?:\.\d+)*)[ \.]/i ) {
 			$gplver      = " (v$1)";
 			@spdx_gplver = ($1);
 		}

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



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