diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-17 10:26:13 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-17 10:27:42 -0400 |
commit | 90b1276b8039642f95f5987ff1d0df413454a6d9 (patch) | |
tree | 72b6a65f3e2614d7b9d693e173d683e234fbac0d /src/lib/Bcfg2/Server/Admin/Syncdb.py | |
parent | 6eeded84fca720269d1fda36f785f01ddeb705bb (diff) | |
download | bcfg2-90b1276b8039642f95f5987ff1d0df413454a6d9.tar.gz bcfg2-90b1276b8039642f95f5987ff1d0df413454a6d9.tar.bz2 bcfg2-90b1276b8039642f95f5987ff1d0df413454a6d9.zip |
expanded pylint coverage to Admin modes, removed some old/broken admin modes
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) |