Verified Commit 9df7ce44 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge branch 'm13'

parents cea393f9 70103358
Pipeline #23234 passed with stages
in 17 minutes and 4 seconds
...@@ -81,16 +81,18 @@ def _get_user_config(args, conf=None): ...@@ -81,16 +81,18 @@ def _get_user_config(args, conf=None):
if not os.path.isfile(args.config): if not os.path.isfile(args.config):
# XXX: The logger is not configured at this stage, # XXX: The logger is not configured at this stage,
# sbws should start with a logger before reading configurations. # sbws should start with a logger before reading configurations.
# #40110: while the log is not configured, do not print, so that
# no output is generated unless there're warnings.
print( print(
"Configuration file %s not found, using defaults." "Configuration file %s not found, using defaults."
% args.config % args.config
) )
return conf return conf
print("Using configuration provided as argument %s" % args.config) # print("Using configuration provided as argument %s" % args.config)
return _extend_config(conf, args.config) return _extend_config(conf, args.config)
user_config_path = _obtain_user_conf_path() user_config_path = _obtain_user_conf_path()
if os.path.isfile(user_config_path): if os.path.isfile(user_config_path):
print("Using configuration file %s" % user_config_path) # print("Using configuration file %s" % user_config_path)
return _extend_config(conf, user_config_path) return _extend_config(conf, user_config_path)
log.debug("No user config found, using defaults.") log.debug("No user config found, using defaults.")
return conf return conf
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment