From 9e149e2abc419d9d595e5731048e398cffe3d0b1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 19 Sep 2016 14:32:01 -0300 Subject: [PATCH 1/2] Fixing dependency generation for jinja templating engine. --- nikola/plugins/template/jinja.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nikola/plugins/template/jinja.py b/nikola/plugins/template/jinja.py index 3ffdf81f77..441dc77b22 100644 --- a/nikola/plugins/template/jinja.py +++ b/nikola/plugins/template/jinja.py @@ -112,7 +112,7 @@ def get_string_deps(self, text): filename = self.lookup.loader.get_source(self.lookup, dep_name)[1] deps.add(filename) sub_deps = self.get_deps(filename) - self.dependency_cache[dep_name] = sub_deps + self.dependency_cache[dep_name] = [filename] + sub_deps deps |= set(sub_deps) return list(deps) From ed00e4d0731eef19bff3a0520341d650ba7f9a8c Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 19 Sep 2016 14:40:52 -0300 Subject: [PATCH 2/2] Simplifying logic. --- nikola/plugins/template/jinja.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nikola/plugins/template/jinja.py b/nikola/plugins/template/jinja.py index 441dc77b22..eeb989cb56 100644 --- a/nikola/plugins/template/jinja.py +++ b/nikola/plugins/template/jinja.py @@ -110,9 +110,8 @@ def get_string_deps(self, text): dep_names = meta.find_referenced_templates(ast) for dep_name in dep_names: filename = self.lookup.loader.get_source(self.lookup, dep_name)[1] - deps.add(filename) - sub_deps = self.get_deps(filename) - self.dependency_cache[dep_name] = [filename] + sub_deps + sub_deps = [filename] + self.get_deps(filename) + self.dependency_cache[dep_name] = sub_deps deps |= set(sub_deps) return list(deps)