diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-01-27 19:28:02 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-01-28 10:19:51 -0600 |
| commit | f4d30301fd4b7dca4375875aedae59e5c3542a34 (patch) | |
| tree | afc57a2280e6eaaebcbbf85c4fee5f21ecd91cf9 | |
| parent | d5c94559b7b15672e354ff4a9ecd4ab50d53819f (diff) | |
| download | bcfg2-f4d30301fd4b7dca4375875aedae59e5c3542a34.tar.gz bcfg2-f4d30301fd4b7dca4375875aedae59e5c3542a34.tar.bz2 bcfg2-f4d30301fd4b7dca4375875aedae59e5c3542a34.zip | |
DBSettings: Fix time_zone option.
In the documentation, in the 1.3.x version and in django this option
is called time_zone (and not timezone). There is no reason to change this.
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 4 | ||||
| -rw-r--r-- | testsuite/common.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index f5b5d16aa..5a83c25c3 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -109,7 +109,7 @@ def finalize_django_config(opts=None, silent=False): OPTIONS=opts.reporting_db_opts, SCHEMA=opts.reporting_db_schema) - settings['TIME_ZONE'] = opts.timezone + settings['TIME_ZONE'] = opts.time_zone settings['TEMPLATE_DEBUG'] = settings['DEBUG'] = \ opts.web_debug @@ -261,7 +261,7 @@ class _OptionContainer(object): type=Bcfg2.Options.Types.comma_dict, default=dict()), # Django options Bcfg2.Options.Option( - cf=('reporting', 'timezone'), help='Django timezone'), + cf=('reporting', 'time_zone'), help='Django timezone'), Bcfg2.Options.BooleanOption( cf=('reporting', 'web_debug'), help='Django debug'), Bcfg2.Options.Option( diff --git a/testsuite/common.py b/testsuite/common.py index 4b29e5f52..fc2397560 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -60,7 +60,7 @@ try: set_setup_default("db_port") set_setup_default("db_opts", dict()) set_setup_default("db_schema") - set_setup_default("timezone") + set_setup_default("time_zone") set_setup_default("web_debug", False) set_setup_default("web_prefix") |