summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/DBSettings.py
diff options
context:
space:
mode:
authorMichael Fenn <fennm@deshawresearch.com>2014-03-24 16:28:59 -0400
committerMichael Fenn <fennm@deshawresearch.com>2014-03-24 16:28:59 -0400
commite06030b424d3405cdf0072f036f41db43634f404 (patch)
tree48bb87e0b3180bdbe8626fd250bc6b92fed26c04 /src/lib/Bcfg2/DBSettings.py
parent852f0c680646d34ff9c17eabf9212af650633d6e (diff)
downloadbcfg2-e06030b424d3405cdf0072f036f41db43634f404.tar.gz
bcfg2-e06030b424d3405cdf0072f036f41db43634f404.tar.bz2
bcfg2-e06030b424d3405cdf0072f036f41db43634f404.zip
Be more robust about checking for reporting_db_engine presence
This matters during the test suite: ====================================================================== ERROR: Failure: AttributeError ('Namespace' object has no attribute 'reporting_db_engine') ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/nose/loader.py", line 364, in loadTestsFromName addr.filename, addr.module) File "/usr/lib/python2.6/site-packages/nose/importer.py", line 39, in importFromPath return self.importFromDir(dir_path, fqname) File "/usr/lib/python2.6/site-packages/nose/importer.py", line 84, in importFromDir mod = load_module(part_fqname, fh, filename, desc) File "/d/en/fennm-0/bcfg2-dbrouter/bcfg2-dbrouter.git/testsuite/Testtools/__init__.py", line 14, in <module> from common import * File "/d/en/fennm-0/bcfg2-dbrouter/bcfg2-dbrouter.git/testsuite/common.py", line 62, in <module> Bcfg2.DBSettings.finalize_django_config() File "/d/en/fennm-0/bcfg2-dbrouter/bcfg2-dbrouter.git/src/lib/Bcfg2/DBSettings.py", line 99, in finalize_django_config if opts.reporting_db_engine is not None: AttributeError: 'Namespace' object has no attribute 'reporting_db_engine'
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
-rw-r--r--src/lib/Bcfg2/DBSettings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py
index f7a610759..e45807094 100644
--- a/src/lib/Bcfg2/DBSettings.py
+++ b/src/lib/Bcfg2/DBSettings.py
@@ -96,7 +96,8 @@ def finalize_django_config(opts=None, silent=False):
OPTIONS=opts.db_opts,
SCHEMA=opts.db_schema))
- if opts.reporting_db_engine is not None:
+ if hasattr(opts, "reporting_db_engine") and \
+ opts.reporting_db_engine is not None:
settings['DATABASES']['Reporting'] = dict(
ENGINE="django.db.backends.%s" % opts.reporting_db_engine,
NAME=opts.reporting_db_name,