Merge pull request #40404 from roaldnefs/fix-djangomod-loaddata

Fix for fixtures in the djangomod module
This commit is contained in:
Mike Place 2017-03-30 16:26:08 -06:00 committed by GitHub
commit 313d21626f

View file

@ -161,18 +161,19 @@ def loaddata(settings_module,
salt '*' django.loaddata <settings_module> <comma delimited list of fixtures>
'''
args = []
kwargs = {}
if database:
kwargs['database'] = database
cmd = '{0} {1}'.format('loaddata', ' '.join(fixtures.split(',')))
return command(settings_module,
'loaddata',
cmd,
bin_env,
pythonpath,
env,
*fixtures.split(','),
**kwargs)
*args, **kwargs)
def collectstatic(settings_module,