diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
| commit | 06dae2a73ae03ea72feed4e7d6e56d25cfa24195 (patch) | |
| tree | 7e9464187639d8d32ba13958d22f7cc853e76e4b /src/lib/Bcfg2/Server/Admin/Syncdb.py | |
| parent | dae8f399151052fd2a0ce43ac61a56f399a28252 (diff) | |
| download | bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.gz bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.bz2 bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.zip | |
Revert "bcfg2-admin: set appropriate return values on error"
This reverts commit dae8f399151052fd2a0ce43ac61a56f399a28252.
Splitting this into two commits.
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Syncdb.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Syncdb.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Syncdb.py b/src/lib/Bcfg2/Server/Admin/Syncdb.py index 53cfd1bec..4ba840b86 100644 --- a/src/lib/Bcfg2/Server/Admin/Syncdb.py +++ b/src/lib/Bcfg2/Server/Admin/Syncdb.py @@ -22,7 +22,10 @@ class Syncdb(Bcfg2.Server.Admin.Mode): call_command("syncdb", interactive=False, verbosity=0) self._database_available = True except ImproperlyConfigured: - self.errExit("Django configuration problem: %s" % - sys.exc_info()[1]) + err = sys.exc_info()[1] + self.log.error("Django configuration problem: %s" % err) + raise SystemExit(1) except: - self.errExit("Database update failed: %s" % sys.exc_info()[1]) + err = sys.exc_info()[1] + self.log.error("Database update failed: %s" % err) + raise SystemExit(1) |