Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 18 insertions, 8 deletions

diff --git a/nikola/plugins/command/bootswatch_theme.py b/nikola/plugins/command/bootswatch_theme.py
index b5644a1..4808fdb 100644
--- a/nikola/plugins/command/bootswatch_theme.py
+++ b/nikola/plugins/command/bootswatch_theme.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright © 2012-2015 Roberto Alsina and others.
+# Copyright © 2012-2016 Roberto Alsina and others.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -36,8 +36,14 @@ from nikola import utils
 LOGGER = utils.get_logger('bootswatch_theme', utils.STDERR_HANDLER)
 
 
-class CommandBootswatchTheme(Command):
+def _check_for_theme(theme, themes):
+    for t in themes:
+        if t.endswith(os.sep + theme):
+            return True
+    return False
+
 
+class CommandBootswatchTheme(Command):
     """Given a swatch name from bootswatch.com and a parent theme, creates a custom theme."""
 
     name = "bootswatch_theme"
@@ -80,23 +86,27 @@ class CommandBootswatchTheme(Command):
         version = ''
 
         # See if we need bootswatch for bootstrap v2 or v3
-        themes = utils.get_theme_chain(parent)
-        if 'bootstrap3' not in themes and 'bootstrap3-jinja' not in themes:
+        themes = utils.get_theme_chain(parent, self.site.themes_dirs)
+        if not _check_for_theme('bootstrap3', themes) and not _check_for_theme('bootstrap3-jinja', themes):
             version = '2'
-        elif 'bootstrap' not in themes and 'bootstrap-jinja' not in themes:
+        elif not _check_for_theme('bootstrap', themes) and not _check_for_theme('bootstrap-jinja', themes):
             LOGGER.warn('"bootswatch_theme" only makes sense for themes that use bootstrap')
-        elif 'bootstrap3-gradients' in themes or 'bootstrap3-gradients-jinja' in themes:
+        elif _check_for_theme('bootstrap3-gradients', themes) or _check_for_theme('bootstrap3-gradients-jinja', themes):
             LOGGER.warn('"bootswatch_theme" doesn\'t work well with the bootstrap3-gradients family')
 
         LOGGER.info("Creating '{0}' theme from '{1}' and '{2}'".format(name, swatch, parent))
         utils.makedirs(os.path.join('themes', name, 'assets', 'css'))
         for fname in ('bootstrap.min.css', 'bootstrap.css'):
-            url = 'http://bootswatch.com'
+            url = 'https://bootswatch.com'
             if version:
                 url += '/' + version
             url = '/'.join((url, swatch, fname))
             LOGGER.info("Downloading: " + url)
-            data = requests.get(url).text
+            r = requests.get(url)
+            if r.status_code > 299:
+                LOGGER.error('Error {} getting {}', r.status_code, url)
+                exit(1)
+            data = r.text
             with open(os.path.join('themes', name, 'assets', 'css', fname),
                       'wb+') as output:
                 output.write(data.encode('utf-8'))