From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Mar 2021 21:49:45 +0000 (+0000)
Subject: media-scraper: wikimedia: Tolerate varying effective licence
X-Git-Tag: otter-0.5.0~545
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab12a59726c4d276e9ee29bea0bbe6a9b738741b;p=otter.git

media-scraper: wikimedia: Tolerate varying effective licence

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/media-scraper b/media-scraper
index 6ce6a75c..c5844388 100755
--- a/media-scraper
+++ b/media-scraper
@@ -81,12 +81,16 @@ sub methodisoffline_none { 0 }
 
 sub methodlic_wikimedia ($) {
   my ($scraper) = @_;
-  return <<END;
+  my $spdx = ${ \ $scraper->('spdx') };
+  return <<END.($spdx =~ m{/} ? <<END : '').<<END;
 These files were all obtained from
     ${ \ $scraper->('site-title') }
 
 They are all available under at least, and distributed here under,
-    ${ \ $scraper->('spdx') }
+    $spdx
+END
+(deepending on the file - consult the source file for details)
+END
 as well as possibly other licences.  There is NO WARRANTY.
 
 See <file>.download-log for the original URL and download timestamp.