From c68f2bea2b877df2edfd2295695996ff97d3b0ab Mon Sep 17 00:00:00 2001 From: fstagni Date: Tue, 1 Aug 2023 17:48:40 +0200 Subject: [PATCH] sweep: #7137 fix: look also for DIRAC.rootPath/etc/dirac.cfg --- .../Client/LocalConfiguration.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py b/src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py index 3613817a5fe..69e8e757dd1 100755 --- a/src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py +++ b/src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py @@ -447,8 +447,9 @@ def __loadCFGFiles(self): Loads possibly several cfg files, in order: 1. cfg files pointed by DIRACSYSCONFIG env variable (comma-separated) 2. ~/.dirac.cfg - 3. cfg files specified in addCFGFile calls - 4. cfg files that come from the command line + 3. DIRAC.rootPath/etc/dirac.cfg + 4. cfg files specified in addCFGFile calls + 5. cfg files that come from the command line """ errorsList = [] foundCFGFile = False @@ -467,7 +468,11 @@ def __loadCFGFiles(self): foundCFGFile = True gConfigurationData.loadFile(os.path.expanduser("~/.dirac.cfg")) - # 3. cfg files specified in addCFGFile calls + # 3. defaultCFGFile = os.path.join(DIRAC.rootPath, "etc", "dirac.cfg") + if os.path.isfile(os.path.join(DIRAC.rootPath, "etc", "dirac.cfg")): + foundCFGFile = True + + # 4. cfg files specified in addCFGFile calls for fileName in self.additionalCFGFiles: if os.path.isfile(fileName): foundCFGFile = True @@ -477,7 +482,7 @@ def __loadCFGFiles(self): gLogger.debug(f"Could not load file {fileName}: {retVal['Message']}") errorsList.append(retVal["Message"]) - # 4. cfg files that come from the command line + # 5. cfg files that come from the command line for fileName in self.cliAdditionalCFGFiles: if os.path.isfile(fileName): foundCFGFile = True