allow a configfile path as single argument to secop-server
when a full path is given as single argument to secop-server, the server name has to be sanitized Change-Id: I1d11f076157548e90877f380f0cab3a6a3f96784 Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28232 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
parent
a379805e43
commit
cb170bd73b
@ -89,9 +89,11 @@ class Server:
|
||||
"""
|
||||
self._testonly = testonly
|
||||
|
||||
self.log = parent_logger.getChild(name, True)
|
||||
if not cfgfiles:
|
||||
cfgfiles = name
|
||||
# sanitize name (in case it is a cfgfile)
|
||||
name = os.path.splitext(os.path.basename(name))[0]
|
||||
self.log = parent_logger.getChild(name, True)
|
||||
merged_cfg = OrderedDict()
|
||||
ambiguous_sections = set()
|
||||
for cfgfile in cfgfiles.split(','):
|
||||
|
Loading…
x
Reference in New Issue
Block a user