From a1291e88c08a4d1e4af18145279487258d7dfbc0 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Wed, 23 May 2012 13:32:51 -0500 Subject: DBStats: Set the initial version baed on updates instead of fixtures --- .../Reports/reports/fixtures/initial_version.xml | 43 ---------------------- src/lib/Bcfg2/Server/Reports/updatefix.py | 7 ++-- 2 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml diff --git a/src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml b/src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml deleted file mode 100644 index bde236989..000000000 --- a/src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 0 - 2008-08-05 11:03:50 - - - 1 - 2008-08-05 11:04:10 - - - 2 - 2008-08-05 13:37:19 - - - 3 - 2008-08-11 08:44:36 - - - 10 - 2008-08-22 11:28:50 - - - 11 - 2009-01-13 12:26:10 - - - 16 - 2010-06-01 12:26:10 - - - 17 - 2010-07-02 00:00:00 - - - 18 - 2011-06-30 00:00:00 - - - 19 - 2012-03-28 00:00:00 - - diff --git a/src/lib/Bcfg2/Server/Reports/updatefix.py b/src/lib/Bcfg2/Server/Reports/updatefix.py index 68d333dfb..b93ae0eb9 100644 --- a/src/lib/Bcfg2/Server/Reports/updatefix.py +++ b/src/lib/Bcfg2/Server/Reports/updatefix.py @@ -287,13 +287,14 @@ def dosync(): # not yet tested for full functionnality django.core.management.call_command("syncdb", interactive=False, verbosity=0) if fresh: - django.core.management.call_command("loaddata", 'initial_version.xml', verbosity=0) + iv = InternalDatabaseVersion.objects.create(version=len(_fixes)) + logger.debug("loading the initial version at %s" % iv.version) elif "syncdb" in dir(django.core.management): # this exist only for django 0.96.* django.core.management.syncdb(interactive=False, verbosity=0) if fresh: - logger.debug("loading the initial_version fixtures") - django.core.management.load_data(fixture_labels=['initial_version'], verbosity=0) + iv = InternalDatabaseVersion.objects.create(version=len(_fixes)) + logger.debug("loading the initial version at %s" % iv.version) else: logger.warning("Don't forget to run syncdb") -- cgit v1.2.3-1-g7c22