From ac4c6213b1dd5e6f84513e7f2b9cfcf390fbbacb Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Wed, 22 Sep 2021 11:31:52 +0200
Subject: [PATCH] uservariables takes precendence over other variables

---
 dotdrop/cfg_yaml.py       | 2 +-
 tests-ng/uservariables.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py
index 95c1a68..5741545 100644
--- a/dotdrop/cfg_yaml.py
+++ b/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)
diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh
index d1de238..46321fe 100755
--- a/tests-ng/uservariables.sh
+++ b/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"