[licensecheck] 04/112: Apply fallback marker "UNKNOWN" after (not during) license detection.

[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 9d0f33dcec934db01e5b150f6451c6c5c3751dad
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Sep 8 15:02:42 2016 +0200

    Apply fallback marker "UNKNOWN" after (not during) license detection.
---
 lib/App/Licensecheck.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index d410c78..0bc1792 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -236,7 +236,8 @@ sub parse_file
 	my $cleaned_content = clean_comments($content);
 
 	return (
-		$self->parse_license( clean_cruft_and_spaces($cleaned_content) ),
+		$self->parse_license( clean_cruft_and_spaces($cleaned_content) )
+			|| "UNKNOWN",
 		copyright( clean_cruft($cleaned_content) ),
 	);
 }
@@ -295,7 +296,7 @@ sub parse_lines
 	}
 
 	$fh->close;
-	return ( $license, $copyrights );
+	return ( $license || "UNKNOWN", $copyrights );
 }
 
 sub clean_comments
@@ -674,8 +675,6 @@ sub parse_license
 		}
 	}
 	#>>>
-	$license = "UNKNOWN" if ( !length($license) );
-	push @spdx_license, "UNKNOWN" unless @spdx_license;
 
 	# Remove trailing spaces.
 	$license =~ s/\s+$//;

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