Skip to content

Commit

Permalink
Can't mix manual and automatic field numbering
Browse files Browse the repository at this point in the history
  • Loading branch information
joar authored and Oleksii Kliukin committed Apr 28, 2017
1 parent c4ba204 commit bf2dc6e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion postgres-appliance/configure_spilo.py
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ def main():
user_config = yaml.load(os.environ.get('SPILO_CONFIGURATION', os.environ.get('PATRONI_CONFIGURATION', ''))) or {}
if not isinstance(user_config, dict):
config_var_name = 'SPILO_CONFIGURATION' if 'SPILO_CONFIGURATION' in os.environ else 'PATRONI_CONFIGURATION'
raise ValueError('{0} should contain a dict, yet it is a {}'.format(config_var_name, type(user_config)))
raise ValueError('{0} should contain a dict, yet it is a {1}'.format(config_var_name, type(user_config)))

config = deep_update(user_config, config)

Expand Down

0 comments on commit bf2dc6e

Please sign in to comment.