From a2a245bd08ee948f3a0505743a4529eb530604be Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Tue, 7 Aug 2012 17:10:54 -0500
Subject: Core: move UpdaterError into the try block

---
 src/lib/Bcfg2/Server/Core.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

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")
-- 
cgit v1.2.3-1-g7c22