uservariables takes precendence over other variables

dotdrop/cfg_yaml.py

@@ -169,7 +169,7 @@ class CfgYaml:
 
         # parse the "uservariables" block
         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
         self._rec_resolve_variables(self.variables)

tests-ng/uservariables.sh

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