This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit aa36afbadf9d7fbd422e592a7f6c52af292152ae
Author: Jonas Smedegaard <d...@jones.dk>
Date: Fri Sep 23 20:37:55 2016 +0200
Tighten regexes: Generalize abbreviated AGPL/LGPL/GPL matching.
---
lib/App/Licensecheck.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 7678834..18a914d 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -400,6 +400,7 @@ sub licensepatterns
# TODO: use Regexp::Common
$list{re}{version}{'-keep'}
= qr/$list{re}{version_prefix}?($list{re}{version_number})/i;
+ $list{re}{xgpl}{'-keep'} = qr/(?:the )?(?:GNU )?([AL]?GPL)/i;
return %list;
}
@@ -616,7 +617,7 @@ sub parse_license
$license = "$L{caption}{$id} (v$1 or v$2)
$license";
push @spdx_license, "$L{name}{$id}-$1 or
$L{name}{$id}-$1";
}
- when ( /$L{re}{$id}(?: $L{re}{version}{-keep}?)(?:
License)?($L{re}{version_later})?(?:,? (?:and|or)(?: the)?(?:GNU)?
(AGPL|GPL|LGPL)(?:-?($L{re}{version_number})(,?
$L{re}{version_later_postfix})?)?)?/i ) {
+ when ( /$L{re}{$id}(?: $L{re}{version}{-keep}?)(?:
License)?($L{re}{version_later})?(?:,? (?:and|or)
$L{re}{xgpl}{-keep}(?:-?($L{re}{version_number})(,?
$L{re}{version_later_postfix})?)?)?/i ) {
$gen_license->( $id, $1, $2, $3, $4 );
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/licensecheck.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
