From 5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Tue, 7 Aug 2012 13:37:33 -0500 Subject: Merge reporting configuration with main server configuration Admin/Syncdb: Use SchemaUpdater Move the schema update routines from reports to Bcfg2.Server Move Reports.settings into Bcfg2.settings --- src/lib/Bcfg2/Server/Admin/Syncdb.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server/Admin/Syncdb.py') diff --git a/src/lib/Bcfg2/Server/Admin/Syncdb.py b/src/lib/Bcfg2/Server/Admin/Syncdb.py index 73dc5b8b2..c9bba0810 100644 --- a/src/lib/Bcfg2/Server/Admin/Syncdb.py +++ b/src/lib/Bcfg2/Server/Admin/Syncdb.py @@ -1,6 +1,7 @@ import Bcfg2.settings import Bcfg2.Options import Bcfg2.Server.Admin +from Bcfg2.Server.SchemaUpdater import update_database, UpdaterError from django.core.management import setup_environ class Syncdb(Bcfg2.Server.Admin.Mode): @@ -10,7 +11,11 @@ class Syncdb(Bcfg2.Server.Admin.Mode): options = {'configfile': Bcfg2.Options.CFILE, 'repo': Bcfg2.Options.SERVER_REPOSITORY} + def __init__(self, setup): + Bcfg2.Server.Admin.Mode.__init__(self, setup) + def __call__(self, args): + import Bcfg2.Server.Admin Bcfg2.Server.Admin.Mode.__call__(self, args) # Parse options @@ -27,7 +32,8 @@ class Syncdb(Bcfg2.Server.Admin.Mode): import Bcfg2.Server.models Bcfg2.Server.models.load_models(cfile=self.opts['configfile']) - from django.core.management.commands import syncdb - - cmd = syncdb.Command() - cmd.handle_noargs(interactive=False) + try: + update_database() + except UpdaterError: + print "Update failed" + raise SystemExit(-1) -- cgit v1.2.3-1-g7c22