diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-05-23 13:32:51 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-05-23 13:32:51 -0500 |
| commit | a1291e88c08a4d1e4af18145279487258d7dfbc0 (patch) | |
| tree | e4ad9894ce1c19b84a90362a6bbd2a9bc5e8f2bb | |
| parent | c424ca4cacae14e5007dc436245fb18fe3591075 (diff) | |
| download | bcfg2-a1291e88c08a4d1e4af18145279487258d7dfbc0.tar.gz bcfg2-a1291e88c08a4d1e4af18145279487258d7dfbc0.tar.bz2 bcfg2-a1291e88c08a4d1e4af18145279487258d7dfbc0.zip | |
DBStats: Set the initial version baed on updates instead of fixtures
| -rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml | 43 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Reports/updatefix.py | 7 |
2 files changed, 4 insertions, 46 deletions
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 @@ -<?xml version='1.0' encoding='utf-8' ?> -<django-objects version="1.0"> - <object pk="1" model="reports.internaldatabaseversion"> - <field type="IntegerField" name="version">0</field> - <field type="DateTimeField" name="updated">2008-08-05 11:03:50</field> - </object> - <object pk="2" model="reports.internaldatabaseversion"> - <field type="IntegerField" name="version">1</field> - <field type="DateTimeField" name="updated">2008-08-05 11:04:10</field> - </object> - <object pk="3" model="reports.internaldatabaseversion"> - <field type="IntegerField" name="version">2</field> - <field type="DateTimeField" name="updated">2008-08-05 13:37:19</field> - </object> - <object pk="4" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>3</field> - <field type='DateTimeField' name='updated'>2008-08-11 08:44:36</field> - </object> - <object pk="5" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>10</field> - <field type='DateTimeField' name='updated'>2008-08-22 11:28:50</field> - </object> - <object pk="5" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>11</field> - <field type='DateTimeField' name='updated'>2009-01-13 12:26:10</field> - </object> - <object pk="6" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>16</field> - <field type='DateTimeField' name='updated'>2010-06-01 12:26:10</field> - </object> - <object pk="7" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>17</field> - <field type='DateTimeField' name='updated'>2010-07-02 00:00:00</field> - </object> - <object pk="8" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>18</field> - <field type='DateTimeField' name='updated'>2011-06-30 00:00:00</field> - </object> - <object pk="8" model="reports.internaldatabaseversion"> - <field type='IntegerField' name='version'>19</field> - <field type='DateTimeField' name='updated'>2012-03-28 00:00:00</field> - </object> -</django-objects> 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") |