From b5205d7c7a73098df0313086dc525528e1d98a0a Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Thu, 23 Feb 2023 17:40:54 +0100 Subject: [PATCH] better guess for cfg file location check for existence of repodir+'/cfg' instead of repodir+'/.git' fixes #4692 Change-Id: Ida841cd31eba851305bcfc0d96019710340c3140 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30510 Tested-by: Jenkins Automated Tests Reviewed-by: Markus Zolliker --- frappy/lib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappy/lib/__init__.py b/frappy/lib/__init__.py index 7cab1d3..ffe0b70 100644 --- a/frappy/lib/__init__.py +++ b/frappy/lib/__init__.py @@ -71,7 +71,7 @@ class GeneralConfig: if path.splitext(sys.executable)[1] == ".exe" and not path.basename(sys.executable).startswith('python'): # special MS windows environment cfg.update(piddir='./', logdir='./log', confdir='./') - elif path.exists(path.join(repodir, '.git')) or os.sep == '\\': # for hands on session + elif path.exists(path.join(repodir, 'cfg')): # running from git repo cfg['confdir'] = path.join(repodir, 'cfg') # take logdir and piddir from /cfg/generalConfig.cfg