getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity

fix naming collision

Browse Source
This commit is contained in:
Daniel Thorn
2016-09-07 11:27:51 -07:00
parent 51b4dd3550
commit 44b54f1e20
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sops/__init__.py
View File

@@ -314,9 +314,9 @@ def main():
# find set location
parent = truncate_tree(tree, set_path.rsplit('[', 1)[0])
# find set key
key = tree_path_comp(set_path.rsplit('[', 1)[1], set_path)
set_key = tree_path_comp(set_path.rsplit('[', 1)[1], set_path)
# set value
parent[key] = value
parent[set_key] = value
# restore sops from stash
tree['sops'] = stash['sops']
else:
@@ -376,7 +376,8 @@ def main():
tree = add_new_master_keys(tree, args.add_kms, args.add_pgp)
tree = remove_master_keys(tree, args.rm_kms, args.rm_pgp)
tree = update_master_keys(tree, key)
os.remove(tmppath)
if not args.set:
os.remove(tmppath)
# always store encrypted binary files in a json enveloppe
if otype == "bytes":