diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
commit | e193079d1779e4d66d80882e6f1c3ff9ba05619b (patch) | |
tree | b47f262f3b7d57a1ddeefd0f2aeba3bb35539d18 /src/lib/Bcfg2/manage.py | |
parent | cd0f5f5f62376f7dc64e5c5c7d59a7c6bfcb918f (diff) | |
parent | 0fdabbcb4668d5f70f76c08a6e3216c5542e7457 (diff) | |
download | bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.gz bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.bz2 bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.zip |
Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/manage.py')
-rwxr-xr-x | src/lib/Bcfg2/manage.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/manage.py b/src/lib/Bcfg2/manage.py index b156deb0f..9675a3db1 100755 --- a/src/lib/Bcfg2/manage.py +++ b/src/lib/Bcfg2/manage.py @@ -1,5 +1,6 @@ #!/usr/bin/env python -import os +""" Wrapper for the django manage.py with the Bcfg2 Opitons parsing. """ + import sys import django import Bcfg2.Options @@ -10,14 +11,21 @@ try: except ImportError: pass -parser = Bcfg2.Options.get_parser() -parser.add_options([Bcfg2.Options.PositionalArgument('django_command', nargs='*')]) -parser.parse() -if __name__ == "__main__": +def main(): + parser = Bcfg2.Options.get_parser() + parser.add_options([ + Bcfg2.Options.PositionalArgument('django_command', nargs='*')]) + parser.parse() + if django.VERSION[0] == 1 and django.VERSION[1] >= 6: from django.core.management import execute_from_command_line - execute_from_command_line(sys.argv[:1] + Bcfg2.Options.setup.django_command) + execute_from_command_line( + sys.argv[:1] + Bcfg2.Options.setup.django_command) else: from django.core.management import execute_manager execute_manager(Bcfg2.DBSettings.settings) + + +if __name__ == "__main__": + main() |