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

fix bug #285

Browse Source
This commit is contained in:
deadc0de6
2020-11-08 13:11:53 +01:00
parent 0f1d9f1ecc
commit ce261c85de
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dotdrop/cfg_yaml.py
View File

@@ -231,8 +231,8 @@ class CfgYaml:
# add the current profile variables # add the current profile variables
_, pv, pvd = self._get_profile_included_vars() _, pv, pvd = self._get_profile_included_vars()
self._add_variables(pv, prio=True) self._add_variables(pv, prio=False)
self._add_variables(pvd, shell=True, prio=True) self._add_variables(pvd, shell=True, prio=False)
self._profilevarskeys.extend(pv.keys()) self._profilevarskeys.extend(pv.keys())
self._profilevarskeys.extend(pvd.keys()) self._profilevarskeys.extend(pvd.keys())
@@ -639,6 +639,11 @@ class CfgYaml:
if prio: if prio:
self.variables = self._merge_dict(new, self.variables) self.variables = self._merge_dict(new, self.variables)
else: else:
# clear existing variable
for k in list(new.keys()):
if k in self.variables.keys():
del new[k]
# merge
self.variables = self._merge_dict(self.variables, new) self.variables = self._merge_dict(self.variables, new)
# ensure enriched variables are relative to this config # ensure enriched variables are relative to this config
self.variables = self._enrich_vars(self.variables, self._profile) self.variables = self._enrich_vars(self.variables, self._profile)
@@ -647,7 +652,7 @@ class CfgYaml:
if template: if template:
# rec resolve variables with new ones # rec resolve variables with new ones
self._rec_resolve_variables(self.variables) self._rec_resolve_variables(self.variables)
if shell: if shell and new:
# shell exec # shell exec
self._shell_exec_dvars(self.variables, keys=new.keys()) self._shell_exec_dvars(self.variables, keys=new.keys())
# re-create the templater # re-create the templater

2
dotdrop/utils.py
View File

@@ -66,7 +66,7 @@ def shell(cmd, debug=False):
returns True|False, output returns True|False, output
""" """
if debug: if debug:
LOG.dbg('shell exec: {}'.format(cmd)) LOG.dbg('shell exec: \"{}\"'.format(cmd))
ret, out = subprocess.getstatusoutput(cmd) ret, out = subprocess.getstatusoutput(cmd)
if debug: if debug:
LOG.dbg('shell result ({}): {}'.format(ret, out)) LOG.dbg('shell result ({}): {}'.format(ret, out))