@@ -450,33 +450,45 @@ def __loadCFGFiles(self):
450
450
4. cfg files that come from the command line
451
451
"""
452
452
errorsList = []
453
+ foundCFGFile = False
453
454
454
455
# 1. $DIRACSYSCONFIG
455
456
if "DIRACSYSCONFIG" in os .environ :
456
457
diracSysConfigFiles = os .environ ["DIRACSYSCONFIG" ].replace (" " , "" ).split ("," )
457
458
for diracSysConfigFile in reversed (diracSysConfigFiles ):
458
459
gLogger .debug (f"Loading file from DIRACSYSCONFIG { diracSysConfigFile } " )
460
+ if os .path .isfile (diracSysConfigFile ):
461
+ foundCFGFile = True
459
462
gConfigurationData .loadFile (diracSysConfigFile )
460
463
461
464
# 2. ~/.dirac.cfg
465
+ if os .path .isfile (os .path .expanduser ("~/.dirac.cfg" )):
466
+ foundCFGFile = True
462
467
gConfigurationData .loadFile (os .path .expanduser ("~/.dirac.cfg" ))
463
468
464
469
# 3. cfg files specified in addCFGFile calls
465
470
for fileName in self .additionalCFGFiles :
466
- gLogger .debug (f"Loading file { fileName } " )
471
+ if os .path .isfile (fileName ):
472
+ foundCFGFile = True
473
+ gLogger .debug (f"Loading file { fileName } " )
467
474
retVal = gConfigurationData .loadFile (fileName )
468
475
if not retVal ["OK" ]:
469
476
gLogger .debug (f"Could not load file { fileName } : { retVal ['Message' ]} " )
470
477
errorsList .append (retVal ["Message" ])
471
478
472
479
# 4. cfg files that come from the command line
473
480
for fileName in self .cliAdditionalCFGFiles :
474
- gLogger .debug (f"Loading file { fileName } " )
481
+ if os .path .isfile (fileName ):
482
+ foundCFGFile = True
483
+ gLogger .debug (f"Loading file { fileName } " )
475
484
retVal = gConfigurationData .loadFile (fileName )
476
485
if not retVal ["OK" ]:
477
486
gLogger .debug (f"Could not load file { fileName } : { retVal ['Message' ]} " )
478
487
errorsList .append (retVal ["Message" ])
479
488
489
+ if not foundCFGFile :
490
+ gLogger .warn ("No CFG file loaded, was that intentional?" )
491
+
480
492
return errorsList
481
493
482
494
def __addUserDataToConfiguration (self ):
0 commit comments