kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make json and yaml files conflict instead of override

Browse source
This commit is contained in:
Anders Ingemann 2014-12-19 01:26:33 +01:00
parent e9137ac172
commit 71e0d943fc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/manifests/__init__.py
View file

@ -5,11 +5,11 @@ from bootstrapvz.common.tools import load_data
partial_json = glob.glob(os.path.join(os.path.dirname(__file__), '*.yml')) partial_json = glob.glob(os.path.join(os.path.dirname(__file__), '*.yml'))
partial_yaml = glob.glob(os.path.join(os.path.dirname(__file__), '*.json')) partial_yaml = glob.glob(os.path.join(os.path.dirname(__file__), '*.json'))
def dictkey(path):
return
# yaml overrides json
partials = {} partials = {}
for path in partial_json + partial_yaml: for path in partial_json + partial_yaml:
key = os.path.splitext(os.path.basename(path))[0] key = os.path.splitext(os.path.basename(path))[0]
if key in partials:
msg = 'Error when loading partial manifests: The partial {key} exists twice'.format(key=key)
raise Exception(msg)
partials[key] = load_data(path) partials[key] = load_data(path)