Module: check_mk
Branch: master
Commit: 47f0c3c01d8e8b00ec3a7c5ddf9ac928072b3ffe
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47f0c3c01d8e8b…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jun 7 10:22:59 2018 +0200
Tiny cleanup.
Change-Id: I7c671e9c3dea5343ab29bed1fd53d724487c8256
---
cmk_base/modes/check_mk.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py
index a12c09c..6fb89bb 100644
--- a/cmk_base/modes/check_mk.py
+++ b/cmk_base/modes/check_mk.py
@@ -1007,11 +1007,16 @@ modes.register(Mode(
],
))
+
+# TODO: The "config" literal should really be centralized somehow.
+def _cmc_file(options):
+ return options["cmc-file"] if "cmc-file" in options else
"config"
+
+
def mode_update_no_precompile(options):
- import cmk_base.core_config as core_config
- if "cmc-file" in options:
- core_config.set_cmc_relfilename(options["cmc-file"])
- core_config.do_update(with_precompile=False)
+ import cmk_base.core_config
+ cmk_base.core_config.set_cmc_relfilename(_cmc_file(options))
+ cmk_base.core_config.do_update(with_precompile=False)
modes.register(Mode(
long_option="update-no-precompile",
@@ -1067,10 +1072,9 @@ modes.register(Mode(
# '----------------------------------------------------------------------'
def mode_update(options):
- import cmk_base.core_config as core_config
- if "cmc-file" in options:
- core_config.set_cmc_relfilename(options["cmc-file"])
- core_config.do_update(with_precompile=True)
+ import cmk_base.core_config
+ cmk_base.core_config.set_cmc_relfilename(_cmc_file(options))
+ cmk_base.core_config.do_update(with_precompile=True)
modes.register(Mode(
long_option="update",