diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 15:58:08 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 15:58:08 -0500 |
commit | 061bd6abbb598659554f28a1a5bba45fd6eca6da (patch) | |
tree | 7332100897f47ebfeac92caa1478e26b95447be0 /src | |
parent | 53d11fea2dae4704650b83f50d35e4208b05157e (diff) | |
parent | b905d6de1989bad49cc27aa9a15899160b3cb9f1 (diff) | |
download | bcfg2-061bd6abbb598659554f28a1a5bba45fd6eca6da.tar.gz bcfg2-061bd6abbb598659554f28a1a5bba45fd6eca6da.tar.bz2 bcfg2-061bd6abbb598659554f28a1a5bba45fd6eca6da.zip |
Merge branch 'add-schemamigration' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index c294e6be5..a17aeca62 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -877,6 +877,7 @@ if HAS_DJANGO: Django management system """ command = None args = [] + kwargs = {} def run(self, _): '''Call a django command''' @@ -885,7 +886,7 @@ if HAS_DJANGO: else: command = self.__class__.__name__.lower() args = [command] + self.args - management.call_command(*args) + management.call_command(*args, **self.kwargs) class DBShell(_DjangoProxyCmd): """ Call the Django 'dbshell' command on the database """ @@ -915,6 +916,17 @@ if HAS_DJANGO: self.logger.error("Database update failed: %s" % err) raise SystemExit(1) + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + class Makemigrations(_DjangoProxyCmd): + """ Call the 'makemigrations' command on the database """ + args = ['Reporting'] + + else: + class Schemamigration(_DjangoProxyCmd): + """ Call the South 'schemamigration' command on the database """ + args = ['Bcfg2.Reporting'] + kwargs = {'auto': True} + if HAS_REPORTS: import datetime |