summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Bcfg2/Server/Core.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 7e0e33024..0676b1d8f 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -108,13 +108,14 @@ class BaseCore(object):
# verify our database schema
try:
from Bcfg2.Server.SchemaUpdater import update_database, UpdaterError
- update_database()
+ try:
+ update_database()
+ except UpdaterError:
+ self.logger.error("Failed to update database schema")
+ raise CoreInitError
except ImportError:
# assume django is not installed
pass
- except UpdaterError:
- self.logger.error("Failed to update database schema")
- raise CoreInitError
except Exception:
inst = sys.exc_info()[1]
self.logger.error("Failed to update database schema")