From 7494e2999b8eeacf85d3dd6028725a3a1adc9997 Mon Sep 17 00:00:00 2001
From: Jakob Haufe <jakob@haufe.it>
Date: Tue, 19 May 2020 15:41:53 +0200
Subject: [PATCH] Do not fail silently when ldap_config yields an ImportError
 itself

---
 netbox/netbox/settings.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 56fd9bb0f..d9368cde0 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -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: