[licensecheck] 31/112: Fix detect licenses mit_old mit_unspecified (was misdetected as mit_new).

[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 ef2d1f43bd1854d7d43b8ab40c8008ccccb393a7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Oct 10 16:47:35 2016 +0200

    Fix detect licenses mit_old mit_unspecified (was misdetected as mit_new).
---
 lib/App/Licensecheck.pm | 7 +++++--
 t/grant.t               | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 12f4b24..baf2777 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -598,7 +598,7 @@ sub parse_license
 			$gen_license->('mit_new');
 		}
 		when ( /$L{re}{'mit_old'}/ ) {
-			$gen_license->('mit_new');
+			$gen_license->('mit_old');
 		}
 	}
 
@@ -707,9 +707,12 @@ sub parse_license
 		when ( /Apache(?: Software)? License(?:,? $ver_prefix_re($ver_re)( or(?: any)? (?:later|newer))?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| \([^(),]\))*,? or(?: the)? bsd(?:[ -](\d)-clause)?\b/i ) {
 			$gen_license->( 'Apache', $1, $2, "BSD-$3-clause" );
 		}
-		when ( /Apache(?: Software)? License(?:,? $ver_prefix_re($ver_re)( or(?: any)? (?:later|newer))?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| \([^(),]\))*,? or (?:$L{re}{mit_new}|$L{re}{mit})\b/i ) {
+		when ( /Apache(?: Software)? License(?:,? $ver_prefix_re($ver_re)( or(?: any)? (?:later|newer))?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| \([^(),]\))*,? or $L{re}{mit_new}\b/i ) {
 			$gen_license->( 'Apache', $1, $2, 'mit_new', $3, $4 );
 		}
+		when ( /Apache(?: Software)? License(?:,? $ver_prefix_re($ver_re)( or(?: any)? (?:later|newer))?)?(?:(?: or)? [^ ,]*?apache[^ ,]*| \([^(),]\))*,? or $L{re}{mit}\b/i ) {
+			$gen_license->( 'Apache', $1, $2, 'mit', $3, $4 );
+		}
 		when ( /Apache(?: Software)? License(?:,? $ver_prefix_re($ver_re)(,? or(?: any)? (?:later|newer))?)?/i ) {
 			$gen_license->( 'Apache', $1, $2 );
 		}
diff --git a/t/grant.t b/t/grant.t
index e7d8d86..16f0eae 100644
--- a/t/grant.t
+++ b/t/grant.t
@@ -35,7 +35,7 @@ run_me(
 	{ license => 'Apache-2.0 or GPL-2', corpus => 'Apache_and_more/PIE.htc' }
 );
 run_me(
-	{   license => 'Apache-2.0 or Expat',
+	{   license => 'Apache-2.0 or MIT~unspecified',
 		corpus  => 'Apache_and_more/rust.lang'
 	}
 );
@@ -76,7 +76,7 @@ run_me(
 
 # MIT
 run_me(
-	{   license => 'Expat',
+	{   license => 'MIT~old',
 		corpus  => 'MIT/harfbuzz-impl.c'
 	}
 );

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