Merge pull request #1595 from getnikola/compiler-config-deps

Merging #1595.
getnikola · Jan 20, 2015 · 9838478 · 9838478
2 parents ffd75d5 + c59f5b9
commit 9838478
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nikola/plugins/compile/markdown/__init__.py b/nikola/plugins/compile/markdown/__init__.py
@@ -64,7 +64,7 @@ def set_site(self, site):
             self.extensions.append(plugin_info.plugin_object)
             plugin_info.plugin_object.short_help = plugin_info.description
 
-        self.config_dependencies.append(site.config.get("MARKDOWN_EXTENSIONS"))
+        self.config_dependencies.append(str(sorted(site.config.get("MARKDOWN_EXTENSIONS"))))
         return super(CompileMarkdown, self).set_site(site)
 
     def compile_html(self, source, dest, is_two_file=True):

diff --git a/nikola/plugins/compile/pandoc.py b/nikola/plugins/compile/pandoc.py
@@ -46,7 +46,7 @@ class CompilePandoc(PageCompiler):
     name = "pandoc"
 
     def set_site(self, site):
-        self.config_dependencies = [self.site.config['PANDOC_OPTIONS']]
+        self.config_dependencies = [str(self.site.config['PANDOC_OPTIONS'])]
 
     def compile_html(self, source, dest, is_two_file=True):
         makedirs(os.path.dirname(dest))