External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2791 from ryanpetrello/fix-iso-installs

Browse Source 
only override django for FIPS in environments where Django is installed

Reviewed-by: Yanis Guenane
             https://github.com/Spredzy
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-11-26 15:36:23 +00:00
committed by GitHub
parent d310c48988 32e7ddd43a
commit 4483d0320f
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/__init__.py
View File

@@ -22,12 +22,18 @@ except ImportError: # pragma: no cover
import hashlib import hashlib
try:
import django import django
from django.utils.encoding import force_bytes from django.utils.encoding import force_bytes
from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.db.backends.base.schema import BaseDatabaseSchemaEditor
from django.db.backends.base import schema from django.db.backends.base import schema
HAS_DJANGO = True
except ImportError:
HAS_DJANGO = False
if HAS_DJANGO is True:
# This line exists to make sure we don't regress on FIPS support if we # This line exists to make sure we don't regress on FIPS support if we
# upgrade Django; if you're upgrading Django and see this error, # upgrade Django; if you're upgrading Django and see this error,
# update the version check below, and confirm that FIPS still works. # update the version check below, and confirm that FIPS still works.