X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=hippotatlib%2F__init__.py;h=e8a502f8a35b88b9ea616e7dce6c0089a5e55401;hb=7852bfc8a1ba1cb194c78c3ee2826886bc1cc0f3;hp=bf599e7559407bc6bae98340294c098eebbaf509;hpb=2eecd19c0f96d98e599b680447510aac06e8dd86;p=hippotat.git 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()