summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-07-20 18:46:09 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-07-20 18:46:09 +0200
commit6e1806d86502497a23acecfe59f54dd44a6393cf (patch)
tree2904030107036c2299cf22713150948a689fa58d
parent33e53dde2a85b8783c8e4935868d9c5f50dea440 (diff)
downloadbcfg2-6e1806d86502497a23acecfe59f54dd44a6393cf.tar.gz
bcfg2-6e1806d86502497a23acecfe59f54dd44a6393cf.tar.bz2
bcfg2-6e1806d86502497a23acecfe59f54dd44a6393cf.zip
DBSettings: Don't use django, if it's not available
-rw-r--r--src/lib/Bcfg2/DBSettings.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py
index 5a83c25c3..8a3992bee 100644
--- a/src/lib/Bcfg2/DBSettings.py
+++ b/src/lib/Bcfg2/DBSettings.py
@@ -271,7 +271,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():
@@ -280,6 +281,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)