diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2015-09-01 10:34:28 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-09-01 10:34:28 -0500 |
| commit | 315d96e6bff85a319d3c3ec2d76da7487fa097e9 (patch) | |
| tree | 9135dbb445082e52d12b0a829cb17a19d609c1fb | |
| parent | 75466a831a92ab136a9cc2b6b875d20f0b00a889 (diff) | |
| parent | 6e1806d86502497a23acecfe59f54dd44a6393cf (diff) | |
| download | bcfg2-315d96e6bff85a319d3c3ec2d76da7487fa097e9.tar.gz bcfg2-315d96e6bff85a319d3c3ec2d76da7487fa097e9.tar.bz2 bcfg2-315d96e6bff85a319d3c3ec2d76da7487fa097e9.zip | |
Merge branch 'no-django' of https://github.com/AlexanderS/bcfg2
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 3e101405d..420f0ddd8 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -278,7 +278,8 @@ class _OptionContainer(object): def component_parsed_hook(opts): """ Finalize the Django config after this component's options are parsed. """ - finalize_django_config(opts=opts) + if HAS_DJANGO: + finalize_django_config(opts=opts) @staticmethod def options_parsed_hook(): @@ -287,6 +288,7 @@ class _OptionContainer(object): early enough in option parsing to be parsed in the 'early' phase. Chances are good that things will break if that happens, but we do our best to be a good citizen. """ - finalize_django_config(silent=True) + if HAS_DJANGO: + finalize_django_config(silent=True) Bcfg2.Options.get_parser().add_component(_OptionContainer) |