mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 17:24:46 +00:00
Code Activity

fix variable templating

Browse Source
This commit is contained in:
deadc0de6
2023-04-11 21:41:21 +02:00
committed by deadc0de
parent 7fdd2deacb
commit caedd7cd8d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dotdrop/cfg_yaml.py
View File

@@ -188,7 +188,7 @@ class CfgYaml:
self._add_variables(dvariables, template=False)
# now template variables and dynvariables from the same pool
self._rec_resolve_variables(self.variables)
self.variables = self._rec_resolve_variables(self.variables)
# and execute dvariables
# since this is done after recursively resolving variables
# and dynvariables this means that variables referencing
@@ -873,7 +873,7 @@ class CfgYaml:
self._redefine_templater()
if template:
# rec resolve variables with new ones
self._rec_resolve_variables(self.variables)
self.variables = self._rec_resolve_variables(self.variables)
if shell and new:
# shell exec
self._shell_exec_dvars(self.variables, keys=new.keys())
@@ -1038,7 +1038,7 @@ class CfgYaml:
mandatory=False)
merged = self._merge_dict(dvar, var)
self._rec_resolve_variables(merged)
merged = self._rec_resolve_variables(merged)
if dvar.keys():
self._shell_exec_dvars(merged, keys=dvar.keys())
self._clear_profile_vars(merged)
@@ -1516,7 +1516,7 @@ class CfgYaml:
templ.update_variables(newvars)
if newvars is self.variables:
self._redefine_templater()
variables = newvars
return newvars
def _get_profile_included_vars(self):
"""
@@ -1755,6 +1755,7 @@ class CfgYaml:
if self._debug:
self._dbg(f'{k}: `{val}` -> {out}')
dic[k] = out
self._debug_dict('dynvars after', dic)
@classmethod
def _check_minversion(cls, minversion):