diff options
Diffstat (limited to 'src/lib/Bcfg2/manage.py')
-rwxr-xr-x | src/lib/Bcfg2/manage.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/manage.py b/src/lib/Bcfg2/manage.py index f88233133..b156deb0f 100755 --- a/src/lib/Bcfg2/manage.py +++ b/src/lib/Bcfg2/manage.py @@ -5,19 +5,19 @@ import django import Bcfg2.Options import Bcfg2.DBSettings -Bcfg2.Options.get_parser().parse() +try: + import Bcfg2.Server.models +except ImportError: + pass -if django.VERSION[0] == 1 and django.VERSION[1] <= 6: - try: - imp.find_module('settings') # Assumed to be in the same directory. - except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__) - sys.exit(1) +parser = Bcfg2.Options.get_parser() +parser.add_options([Bcfg2.Options.PositionalArgument('django_command', nargs='*')]) +parser.parse() if __name__ == "__main__": - if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + 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) + execute_from_command_line(sys.argv[:1] + Bcfg2.Options.setup.django_command) else: - execute_manager(settings) + from django.core.management import execute_manager + execute_manager(Bcfg2.DBSettings.settings) |