Merge pull request #53 from techman83/add_unlicense-fix_bug

Add unlicense fix bug
KSP-CKAN · May 25, 2016 · f3bb17f · f3bb17f
2 parents 5d56a8c + b8a8003
commit f3bb17f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/lib/App/KSP_CKAN/Roles/Licenses.pm b/lib/App/KSP_CKAN/Roles/Licenses.pm
@@ -102,6 +102,7 @@ method _build__license_urls {
     "W3C"               => 'https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document',
     "Zlib"              => 'http://www.zlib.net/zlib_license.html',
     "Zope"              => 'http://old.zope.org/Resources/License.1',
+    "Unlicense"         => 'https://unlicense.org/UNLICENSE',
   }
 }
 
@@ -144,6 +145,7 @@ method redistributable_licenses {
     "Zlib",
     "Zope",
     "WTFPL",
+    "Unlicense",
     "open-source", "unrestricted" ];
 }
 

diff --git a/lib/App/KSP_CKAN/Tools/IA.pm b/lib/App/KSP_CKAN/Tools/IA.pm
@@ -265,7 +265,7 @@ method ckan_mirrored( :$ckan ) {
     $self->logdie("Metadata JSON failed to parse");
   };
 
-  if ( any { uc($_->{sha1}) eq $ckan->download_sha1 } @{$data->{files}} ) {
+  if ( any { defined $_->{sha1} && uc($_->{sha1}) eq $ckan->download_sha1 } @{$data->{files}} ) {
     return 1;
   }
 

diff --git a/t/App/KSP_CKAN/Roles/Licenses.t b/t/App/KSP_CKAN/Roles/Licenses.t
@@ -40,6 +40,7 @@ subtest 'licenses' => sub {
       "Zlib",
       "Zope",
       "WTFPL",
+      "Unlicense",
       "open-source", "unrestricted" ];
 
   my @test = $licenses->redistributable_licenses;