diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-08-07 17:10:54 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-08-07 17:11:41 -0500 |
| commit | a2a245bd08ee948f3a0505743a4529eb530604be (patch) | |
| tree | f34c88645c3cbc143faa6a8b0125e0fbbe7d350f /src | |
| parent | c3d1a9b1ea3a561f9cda1fafa5ec4112f63297af (diff) | |
| download | bcfg2-a2a245bd08ee948f3a0505743a4529eb530604be.tar.gz bcfg2-a2a245bd08ee948f3a0505743a4529eb530604be.tar.bz2 bcfg2-a2a245bd08ee948f3a0505743a4529eb530604be.zip | |
Core: move UpdaterError into the try block
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 9 |
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") |