[licensecheck] 38/112: Fix version identifier to use + only in machine-readable mode.

[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 79fa465e3ce2dce97369c7f4d2bb0c1879b9e6ac
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Oct 8 05:07:31 2016 +0200

    Fix version identifier to use + only in machine-readable mode.
---
 lib/App/Licensecheck.pm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index 9fd969a..7d88ba5 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -429,13 +429,25 @@ sub parse_license
 		my @spdx;
 		my $name = $L{name}{$id}    || $id;
 		my $desc = $L{caption}{$id} || $id;
-		$v .= '+' if ($later);
-		push @spdx, $v ? "$name-$v" : $name if ($id);
+		if ($v) {
+			push @spdx, $later ? "$name-$v+" : "$name-$v";
+			$v .= ' or later' if ($later);
+		}
+		else {
+			push @spdx, $name;
+		}
 		my ( $name2, $desc2 );
-		$name2 = $L{name}{$id2}    || $id2 if ($id2);
-		$desc2 = $L{caption}{$id2} || $id2 if ($id2);
-		$v2 .= '+' if ($later2);
-		push @spdx, $v2 ? "$name2-$v2" : "$name2" if ($id2);
+		if ($id2) {
+			$name2 = $L{name}{$id2}    || $id2;
+			$desc2 = $L{caption}{$id2} || $id2;
+			if ($v2) {
+				push @spdx, $later2 ? "$name2-$v2+" : "$name2-$v2";
+				$v2 .= ' or later' if ($later2);
+			}
+			else {
+				push @spdx, $name2;
+			}
+		}
 		my $legacy = join(
 			' ',
 			$desc,

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