From 7852bfc8a1ba1cb194c78c3ee2826886bc1cc0f3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 9 Apr 2017 16:10:04 +0100 Subject: [PATCH] config: Break out read_config (and change default config files a bit) Signed-off-by: Ian Jackson --- hippotatlib/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hippotatlib/__init__.py b/hippotatlib/__init__.py index bf599e7..e8a502f 100644 --- a/hippotatlib/__init__.py +++ b/hippotatlib/__init__.py @@ -562,6 +562,11 @@ def common_startup(process_cfg): need_defcfg = False readconfig(value) + def read_defconfig(): + readconfig('/etc/hippotat/config.d', False) + readconfig('/etc/hippotat/passwords.d', False) + readconfig('/etc/hippotat/master.cfg', False) + def dfs_less_detailed(dl): return [df for df in DBG.iterconstants() if df <= dl] @@ -629,8 +634,7 @@ just `+': all DFLAGs. if len(args): optparser.error('no non-option arguments please') if need_defcfg: - readconfig('/etc/hippotat/config', False) - readconfig('/etc/hippotat/config.d', False) + read_defconfig() try: (pss, pcs) = _cfg_process_putatives() -- 2.11.0