Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19367 from open-craft/giovanni/bb-674-django-configuration-preferences

Browse Source 
BB-674 - Change Django's configuration precedence in manage.py
This commit is contained in:
Brian Mesick
2019-01-07 09:25:12 -05:00
committed by GitHub
parent 1fa2570aab 56820777c4
commit b35cf731a1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manage.py
View File

@@ -97,11 +97,13 @@ def parse_args():
if __name__ == "__main__":
edx_args, django_args = parse_args()
edx_args_base = edx_args.settings_base.replace('/', '.') + '.'
if edx_args.settings:
os.environ["DJANGO_SETTINGS_MODULE"] = edx_args.settings_base.replace('/', '.') + "." + edx_args.settings
else:
os.environ.setdefault("DJANGO_SETTINGS_MODULE", edx_args.default_settings)
os.environ["DJANGO_SETTINGS_MODULE"] = edx_args_base + edx_args.settings
elif os.environ.get("EDX_PLATFORM_SETTINGS") and not os.environ.get("DJANGO_SETTINGS_MODULE"):
os.environ["DJANGO_SETTINGS_MODULE"] = edx_args_base + os.environ["EDX_PLATFORM_SETTINGS"]
os.environ.setdefault("DJANGO_SETTINGS_MODULE", edx_args.default_settings)
os.environ.setdefault("SERVICE_VARIANT", edx_args.service_variant)
enable_contracts = os.environ.get('ENABLE_CONTRACTS', False)