Merge pull request #1194 from coreos-inc/smallfixes

Small fixes
This commit is contained in:
josephschorr 2016-01-29 21:30:18 +02:00
commit 4468af1594
2 changed files with 3 additions and 2 deletions

View file

@ -30,7 +30,7 @@ def gen_sqlalchemy_metadata(peewee_model_list):
all_indexes = set(meta.indexes) all_indexes = set(meta.indexes)
columns = [] columns = []
for field in meta.get_fields(): for field in meta.sorted_fields:
alchemy_type = None alchemy_type = None
col_args = [] col_args = []
col_kwargs = {} col_kwargs = {}

View file

@ -37,8 +37,9 @@ def get_storage_providers(config):
try: try:
for name, parameters in storage_config.items(): for name, parameters in storage_config.items():
drivers[name] = (parameters[0], get_storage_driver(parameters)) drivers[name] = (parameters[0], get_storage_driver(None, parameters))
except TypeError: except TypeError:
logger.exception('Missing required storage configuration provider')
raise Exception('Missing required storage configuration parameter(s): %s' % name) raise Exception('Missing required storage configuration parameter(s): %s' % name)
return drivers return drivers