From 8062b4ad7f61c25ddf7c3f0d91335156430d3090 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 1 Mar 2018 23:47:31 +0100 Subject: Update git submodules * Update docs/submodules/pharos from branch 'master' - generate_config: New `-i` arg for j2 includes dir jinja2 does not support imports from parent directories, so in order for j2 to be able to use '{% from .j2 import ... %}' constructs with included j2 residing on a separate dirpath than current j2, add support for explicitly adding directories to the templater search path. This also allows calling generate_config with only file basename as '-j' arg value, as long as the dirname is passed via '-i' (can be extended later to parsing multiple j2 files at once). Change-Id: I943fda9262a6f7de5ee6fcc3e7bc9828c339651a Signed-off-by: Alexandru Avadanii - generate_config: Enable 'do' j2 extension 'do' is useful to avoid hacks like {% set _ = x.update(...) %}. Instead: {% do x.update(...) %}. [1] http://jinja.pocoo.org/docs/2.10/extensions/ Change-Id: I886beb97e0383ba11b81aa21cf12b11ebc4b05b2 Signed-off-by: Alexandru Avadanii --- docs/submodules/pharos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/submodules/pharos') diff --git a/docs/submodules/pharos b/docs/submodules/pharos index d7603817b..873258789 160000 --- a/docs/submodules/pharos +++ b/docs/submodules/pharos @@ -1 +1 @@ -Subproject commit d7603817b4d82b3e4c493d9f4c2367b84c8f1e23 +Subproject commit 87325878949d5a315535720828af5185ebaa7a9f -- cgit 1.2.3-korg