Don’t break galleries if yaml is missing

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Apr 22, 2018 · 11940cc · 11940cc
1 parent 353acf3
commit 11940cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/nikola/data/symlinked.txt b/nikola/data/symlinked.txt
@@ -23,10 +23,13 @@ nikola/data/themes/base/assets/js/html5shiv-printshiv.min.js
 nikola/data/themes/base/assets/js/justified-layout.min.js
 nikola/data/themes/base/assets/js/moment-with-locales.min.js
 nikola/data/themes/base/messages/messages_cz.py
+nikola/data/themes/bootblog4-jinja/assets/css/bootblog.css
+nikola/data/themes/bootblog4-jinja/bundles
 nikola/data/themes/bootstrap4-jinja/assets/css/bootstrap.min.css
 nikola/data/themes/bootstrap4-jinja/assets/js/bootstrap.min.js
 nikola/data/themes/bootstrap4-jinja/assets/js/jquery.min.js
 nikola/data/themes/bootstrap4-jinja/assets/js/popper.min.js
+nikola/data/themes/bootstrap4-jinja/bundles
 nikola/data/themes/bootstrap4/assets/css/bootstrap.min.css
 nikola/data/themes/bootstrap4/assets/js/bootstrap.min.js
 nikola/data/themes/bootstrap4/assets/js/jquery.min.js

diff --git a/nikola/plugins/task/galleries.py b/nikola/plugins/task/galleries.py
@@ -32,7 +32,11 @@
 import json
 import mimetypes
 import os
-import yaml
+
+try:
+    import yaml
+except ImportError:
+    yaml = None  # NOQA
 
 try:
     from urlparse import urljoin
@@ -446,6 +450,8 @@ def find_metadata(self, gallery, lang):
         self.logger.debug("Using {0} for gallery {1}".format(
             used_path, gallery))
         with open(used_path, "r") as meta_file:
+            if yaml is None:
+                utils.req_missing(['PyYAML'], 'use metadata.yml files for galleries')
             meta = yaml.safe_load_all(meta_file)
             for img in meta:
                 # load_all and safe_load_all both return None as their