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

trans gets replaced with trans_read in dotfiles

Browse Source
This commit is contained in:
deadc0de6
2019-06-09 17:50:06 +02:00
parent acc2c83e22
commit 9df3522a17
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dotdrop/cfg_aggregator.py
View File

@@ -124,7 +124,8 @@ class CfgAggregator:
for k in okeys: for k in okeys:
o = get_by_key(k) o = get_by_key(k)
if not o: if not o:
err = 'bad key for \"{}\": {}'.format(c.key, k) err = 'bad {} key for \"{}\": {}'.format(keys, c.key, k)
self.log.err(err)
raise Exception(err) raise Exception(err)
objects.append(o) objects.append(o)
if self.debug: if self.debug:

10
dotdrop/cfg_yaml.py
View File

@@ -292,16 +292,24 @@ class CfgYaml:
return new return new
def _norm_dotfiles(self, dotfiles): def _norm_dotfiles(self, dotfiles):
"""add 'src' as 'key if not present""" """normalize dotfiles entries"""
if not dotfiles: if not dotfiles:
return dotfiles return dotfiles
new = {} new = {}
for k, v in dotfiles.items(): for k, v in dotfiles.items():
# add 'src' as key' if not present
if self.key_dotfile_src not in v: if self.key_dotfile_src not in v:
v[self.key_dotfile_src] = k v[self.key_dotfile_src] = k
new[k] = v new[k] = v
else: else:
new[k] = v new[k] = v
# fix deprecated trans key
if self.old_key_trans_r in k:
msg = '\"trans\" is deprecated, please use \"trans_read\"'
self.log.warn(msg)
v[self.key_trans_r] = v[self.old_key_trans_r].copy()
del v[self.old_key_trans_r]
new[k] = v
return new return new
def _get_variables_dict(self, profile, seen, sub=False): def _get_variables_dict(self, profile, seen, sub=False):

2
dotdrop/dotfile.py
View File

@@ -14,7 +14,7 @@ class Dotfile(DictParser):
"""Represent a dotfile.""" """Represent a dotfile."""
# dotfile keys # dotfile keys
key_noempty = 'ignoreempty' key_noempty = 'ignoreempty'
key_trans_r = 'trans' key_trans_r = 'trans_read'
key_trans_w = 'trans_write' key_trans_w = 'trans_write'
def __init__(self, key, dst, src, def __init__(self, key, dst, src,