diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Syncdb.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Syncdb.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Syncdb.py b/src/lib/Bcfg2/Server/Admin/Syncdb.py index 4126c18af..4ba840b86 100644 --- a/src/lib/Bcfg2/Server/Admin/Syncdb.py +++ b/src/lib/Bcfg2/Server/Admin/Syncdb.py @@ -1,3 +1,4 @@ +import sys import Bcfg2.settings import Bcfg2.Options import Bcfg2.Server.Admin @@ -6,27 +7,25 @@ from django.core.management import setup_environ, call_command class Syncdb(Bcfg2.Server.Admin.Mode): - __shorthelp__ = ("Sync the Django ORM with the configured database") - __longhelp__ = __shorthelp__ + "\n\nbcfg2-admin syncdb" - __usage__ = "bcfg2-admin syncdb" + """ Sync the Django ORM with the configured database """ options = {'configfile': Bcfg2.Options.WEB_CFILE} def __call__(self, args): # Parse options - self.opts = Bcfg2.Options.OptionParser(self.options) - self.opts.parse(args) + opts = Bcfg2.Options.OptionParser(self.options) + opts.parse(args) setup_environ(Bcfg2.settings) - Bcfg2.Server.models.load_models(cfile=self.opts['configfile']) + Bcfg2.Server.models.load_models(cfile=opts['configfile']) try: call_command("syncdb", interactive=False, verbosity=0) self._database_available = True except ImproperlyConfigured: - self.logger.error("Django configuration problem: %s" % - format_exc().splitlines()[-1]) - raise SystemExit(-1) + err = sys.exc_info()[1] + self.log.error("Django configuration problem: %s" % err) + raise SystemExit(1) except: - self.logger.error("Database update failed: %s" % - format_exc().splitlines()[-1]) - raise SystemExit(-1) + err = sys.exc_info()[1] + self.log.error("Database update failed: %s" % err) + raise SystemExit(1) |