X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Fconfig.py;h=24a95a86d28ce25f05a20f7e3d9ec7396ab7c425;hb=9d976c8e73cbccd8326e2046c6d7b4b86b974b93;hp=6bb522cf6ddfa44614f85c86b4622b75e12c9fae;hpb=076787ab22f087dc3a9a0212e0b09227b250bf32;p=tools%2Fsat.git diff --git a/commands/config.py b/commands/config.py index 6bb522c..24a95a8 100644 --- a/commands/config.py +++ b/commands/config.py @@ -22,7 +22,6 @@ import platform import datetime import shutil import gettext -from pathlib import Path import pprint as PP import src @@ -287,15 +286,9 @@ class ConfigManager: # Load LOCAL config file # search only in the data directory src.pyconf.streamOpener = ConfigOpener([cfg.VARS.datadir]) - - # if `local.pyconf` file is missing, create it from - # `local_original.pyconf` template file - localconf_path = osJoin(cfg.VARS.datadir, 'local.pyconf') - if not Path(localconf_path).is_file(): - shutil.copyfile(osJoin(cfg.VARS.datadir, 'local_original.pyconf'), localconf_path) - try: - local_cfg = src.pyconf.Config(open(localconf_path), + local_cfg = src.pyconf.Config(open( osJoin(cfg.VARS.datadir, + 'local.pyconf')), PWD = ('LOCAL', cfg.VARS.datadir) ) except src.pyconf.ConfigError as e: raise src.SatException(_("Error in configuration file: " @@ -1075,7 +1068,7 @@ def get_config_children(config, args): if dir(a).__contains__('keys'): vals = map(lambda x: head + '.' + x, [m for m in a.keys() if m.startswith(tail)]) - except: + except Exception: pass for v in sorted(vals):