cfg path quick fix for hands-on session
Change-Id: If79f76ed17dce6a5587deaae2eae4eda77546306 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30503 Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch> Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
This commit is contained in:
parent
f4fac1f3dd
commit
31706093fb
@ -21,6 +21,7 @@
|
|||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
"""Define helpers"""
|
"""Define helpers"""
|
||||||
|
|
||||||
|
import os
|
||||||
import importlib
|
import importlib
|
||||||
import linecache
|
import linecache
|
||||||
import socket
|
import socket
|
||||||
@ -70,7 +71,7 @@ class GeneralConfig:
|
|||||||
if path.splitext(sys.executable)[1] == ".exe" and not path.basename(sys.executable).startswith('python'):
|
if path.splitext(sys.executable)[1] == ".exe" and not path.basename(sys.executable).startswith('python'):
|
||||||
# special MS windows environment
|
# special MS windows environment
|
||||||
cfg.update(piddir='./', logdir='./log', confdir='./')
|
cfg.update(piddir='./', logdir='./log', confdir='./')
|
||||||
elif path.exists(path.join(repodir, '.git')):
|
elif path.exists(path.join(repodir, '.git')) or os.sep == '\\': # for hands on session
|
||||||
# running from git repo
|
# running from git repo
|
||||||
cfg['confdir'] = path.join(repodir, 'cfg')
|
cfg['confdir'] = path.join(repodir, 'cfg')
|
||||||
# take logdir and piddir from <repodir>/cfg/generalConfig.cfg
|
# take logdir and piddir from <repodir>/cfg/generalConfig.cfg
|
||||||
|
Loading…
x
Reference in New Issue
Block a user