From 3d3419fbe59ab8cf6348ad559d65a46e0cd54a2a Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 1 Sep 2015 20:59:43 +0200 Subject: [PATCH 1/2] Fixing wrong file_deps for copy_assets's copy tasks. --- nikola/plugins/task/copy_assets.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nikola/plugins/task/copy_assets.py b/nikola/plugins/task/copy_assets.py index 58521d4139..3ebc78dfc3 100644 --- a/nikola/plugins/task/copy_assets.py +++ b/nikola/plugins/task/copy_assets.py @@ -77,7 +77,9 @@ def gen_tasks(self): task['uptodate'] = [utils.config_changed(kw, 'nikola.plugins.task.copy_assets')] task['basename'] = self.name if code_css_input: - task['file_dep'] = [code_css_input] + if 'file_dep' not in task: + task['file_dep'] = [] + task['file_dep'].append(code_css_input) yield utils.apply_filters(task, kw['filters']) # Check whether or not there is a code.css file around. From 2d5e1cfffebc71f39c03da378df24250d69759ec Mon Sep 17 00:00:00 2001 From: IGARASHI Masanao Date: Wed, 2 Sep 2015 06:23:05 +0900 Subject: [PATCH 2/2] Remove duplicate attributes --- nikola/data/themes/base/templates/author.tmpl | 4 ++-- nikola/data/themes/base/templates/tag.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nikola/data/themes/base/templates/author.tmpl b/nikola/data/themes/base/templates/author.tmpl index e4082a33f3..029f2e9c1f 100644 --- a/nikola/data/themes/base/templates/author.tmpl +++ b/nikola/data/themes/base/templates/author.tmpl @@ -5,10 +5,10 @@ ${parent.extra_head()} %if len(translations) > 1 and generate_rss: %for language in sorted(translations): - + %endfor %elif generate_rss: - + %endif diff --git a/nikola/data/themes/base/templates/tag.tmpl b/nikola/data/themes/base/templates/tag.tmpl index 8179fba0e5..5ce4da496c 100644 --- a/nikola/data/themes/base/templates/tag.tmpl +++ b/nikola/data/themes/base/templates/tag.tmpl @@ -5,10 +5,10 @@ ${parent.extra_head()} %if len(translations) > 1 and generate_rss: %for language in sorted(translations): - + %endfor %elif generate_rss: - + %endif