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

uservariables takes precendence over other variables

Browse Source
This commit is contained in:
deadc0de6
2021-09-22 11:31:52 +02:00
parent aa8e1d8b3e
commit ac4c6213b1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotdrop/cfg_yaml.py
View File

@@ -169,7 +169,7 @@ class CfgYaml:
# parse the "uservariables" block # parse the "uservariables" block
uvariables = self._parse_blk_uservariables(self._yaml_dict) uvariables = self._parse_blk_uservariables(self._yaml_dict)
self._add_variables(uvariables, template=False) self._add_variables(uvariables, template=False, prio=True)
# now template variables and dynvariables from the same pool # now template variables and dynvariables from the same pool
self._rec_resolve_variables(self.variables) self._rec_resolve_variables(self.variables)

6
tests-ng/uservariables.sh
View File

@@ -61,6 +61,12 @@ config:
backup: true backup: true
create: true create: true
dotpath: dotfiles dotpath: dotfiles
variables:
var1: abc
var2: def
dynvariables:
var1: "echo ghi"
var2: "echo jkl"
uservariables: uservariables:
var1: "var1" var1: "var1"
var2: "var2" var2: "var2"