[licensecheck] 03/26: Sort before enumerating ambiguously related combo licenses.

[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 4abf3ccaabb6a40e8cef5d2743f5c9d602288c27
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Nov 26 13:36:49 2016 +0100

    Sort before enumerating ambiguously related combo licenses.
---
 lib/App/Licensecheck.pm | 2 +-
 t/fedora.t              | 2 +-
 t/grant.t               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 1aef8f3..c605a5e 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -954,7 +954,7 @@ sub parse_license
 
 	# Remove trailing spaces.
 	$license =~ s/\s+$//;
-	return $self->deb_fmt ? join( ' and/or ', @spdx_license ) : $license;
+	return $self->deb_fmt ? join( ' and/or ', sort @spdx_license ) : $license;
 }
 
 =encoding UTF-8
diff --git a/t/fedora.t b/t/fedora.t
index 8fb4e5a..b1d3b52 100644
--- a/t/fedora.t
+++ b/t/fedora.t
@@ -27,7 +27,7 @@ test "Parse corpus" => sub {
 
 run_me(
 	{   license =>
-			'ICU and/or MIT-enna and/or MIT-feh and/or Expat and/or MIT~old and/or MIT~oldstyle and/or MIT~oldstyle~disclaimer and/or DSDP and/or Adobe-Glyph and/or BSL and/or PostgreSQL',
+			'Adobe-Glyph and/or BSL and/or DSDP and/or Expat and/or ICU and/or MIT-enna and/or MIT-feh and/or MIT~old and/or MIT~oldstyle and/or MIT~oldstyle~disclaimer and/or PostgreSQL',
 		corpus => 'MIT'
 	}
 );
diff --git a/t/grant.t b/t/grant.t
index 6c304d4..e6d6330 100644
--- a/t/grant.t
+++ b/t/grant.t
@@ -27,7 +27,7 @@ test "Parse corpus" => sub {
 
 # AFL
 run_me(
-	{   license => 'LGPL-2+ and/or AFL-2.0',
+	{   license => 'AFL-2.0 and/or LGPL-2+',
 		corpus  => 'AFL_and_more/xdgmime.c'
 	}
 );
@@ -84,7 +84,7 @@ run_me(
 
 # EPL
 run_me(
-	{   license => 'LGPL-2.1+ or GPL-3+ and/or AGPL-3+ and/or Apache-2.0+',
+	{   license => 'AGPL-3+ and/or Apache-2.0+ and/or LGPL-2.1+ or GPL-3+',
 		corpus  => 'EPL_and_more/Base64Coder.java'
 	}
 );
@@ -145,7 +145,7 @@ TODO: {
 
 # misc
 run_me(
-	{   license => 'LGPL-2.1 or LGPL-3 and/or GPL-3',
+	{   license => 'GPL-3 and/or LGPL-2.1 or LGPL-3',
 		corpus  => 'misc/rpplexer.h'
 	}
 );

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