NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 20:06:25 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Do not fail silently when ldap_config yields an ImportError itself

Browse Source
This commit is contained in:
Jakob Haufe 2020-05-19 15:41:53 +02:00
parent cd236aa886
commit 7494e2999b
No known key found for this signature in database
GPG Key ID: 07C6102015375A3B
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/settings.py
View File

@ -382,8 +382,11 @@ CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
try:
from netbox import ldap_config as LDAP_CONFIG
except ImportError:
LDAP_CONFIG = None
except ImportError as ie:
if ie.name == 'netbox':
LDAP_CONFIG = None
else:
raise ie
if LDAP_CONFIG is not None: