Commit 6aabf84f authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 96a0484a
...@@ -24,7 +24,7 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f ...@@ -24,7 +24,7 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f
[slaplte.jinja2] [slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2 _update_hash_filename_ = slaplte.jinja2
md5sum = 7be5ebdb7fd13c342b9c7b54c9ba346f md5sum = dc3bff7742d78a7831748a51659f63a4
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
...@@ -96,7 +96,7 @@ md5sum = c807be73b9304f5a4c7483a3776bbc17 ...@@ -96,7 +96,7 @@ md5sum = c807be73b9304f5a4c7483a3776bbc17
[template-ue] [template-ue]
_update_hash_filename_ = instance-ue.jinja2.cfg _update_hash_filename_ = instance-ue.jinja2.cfg
md5sum = 7c3fdaa115a932b51216c7940aa8ea49 md5sum = aa6b8e50bd8d9c4cc6e23b01a2be5644
[template-obsolete] [template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg _update_hash_filename_ = instance-obsolete.jinja2.cfg
......
...@@ -17,6 +17,8 @@ offline = true ...@@ -17,6 +17,8 @@ offline = true
{%- set icell_kind='ue' %} {%- set icell_kind='ue' %}
{%- import 'slaplte.jinja2' as slaplte with context %} {%- import 'slaplte.jinja2' as slaplte with context %}
{%- import 'ru_libinstance.jinja2.cfg' as rulib with context %} {%- import 'ru_libinstance.jinja2.cfg' as rulib with context %}
{%- set iue_dict = {} %}
{%- do slaplte.load_iue(iue_dict) %}
{%- do slaplte.check_loaded_everything() %} {%- do slaplte.check_loaded_everything() %}
{{ rulib.buildout() }} {{ rulib.buildout() }}
...@@ -118,6 +120,7 @@ output = ${directory:etc}/ue.cfg ...@@ -118,6 +120,7 @@ output = ${directory:etc}/ue.cfg
extra-context = extra-context =
json iru_dict {{ rulib.iru_dict | tojson }} json iru_dict {{ rulib.iru_dict | tojson }}
json icell_dict {{ rulib.icell_dict | tojson }} json icell_dict {{ rulib.icell_dict | tojson }}
json iue_dict {{ iue_dict | tojson }}
import json_module json import json_module json
import-list = import-list =
rawfile slaplte.jinja2 {{ slaplte_template }} rawfile slaplte.jinja2 {{ slaplte_template }}
......
...@@ -378,7 +378,6 @@ ...@@ -378,7 +378,6 @@
iue_dict keeps ue shared instance: reference -> iue iue_dict keeps ue shared instance: reference -> iue
#} #}
{%- set iue_dict = {} %}
{%- macro load_iue(iue_dict) %} {%- macro load_iue(iue_dict) %}
{%- set qother = [] %} {%- set qother = [] %}
{%- for ishared in qshared_instance_list %} {%- for ishared in qshared_instance_list %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment