jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename user's configuration (again), to use '.py' extentions. 

* Change: In CRL Core, in coriolisInit.py user configuration files are
    now suffixed ".py" instead of ".conf" (for settings & techno).
This commit is contained in:
Jean-Paul Chaput 2014-10-03 19:11:06 +02:00
parent fddf11516a
commit 60b0aa5ca7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crlcore/src/crlcore/coriolisInit.py
View File

@ -88,8 +88,8 @@ def coriolisConfigure():
technoFiles = [ helpers.sysConfDir+'/techno.conf' ] technoFiles = [ helpers.sysConfDir+'/techno.conf' ]
if os.getenv('HOME'): if os.getenv('HOME'):
technoFiles += [ os.getenv('HOME')+'/.coriolis2/techno.conf' ] technoFiles += [ os.getenv('HOME')+'/.coriolis2/techno.py' ]
technoFiles += [ os.getcwd()+'/.coriolis2/techno.conf' ] technoFiles += [ os.getcwd()+'/.coriolis2/techno.py' ]
technoFiles.reverse() technoFiles.reverse()
for technoFile in technoFiles: for technoFile in technoFiles:
@ -121,13 +121,13 @@ def coriolisConfigure():
, (helpers.sysConfDir+'/'+symbolicTechno+'/plugins.conf' , SystemFile|ConfigurationHelper) , (helpers.sysConfDir+'/'+symbolicTechno+'/plugins.conf' , SystemFile|ConfigurationHelper)
] ]
if os.getenv('HOME'): if os.getenv('HOME'):
confFiles += [ (os.getenv('HOME')+'/.coriolis2/settings.conf', 0) ] confFiles += [ (os.getenv('HOME')+'/.coriolis2/settings.py', 0) ]
else: else:
w = WarningMessage(['The <HOME> environment variable is not defined, this is most unusual.' w = WarningMessage(['The <HOME> environment variable is not defined, this is most unusual.'
,'It prevents the loading of ${HOME}/.coriolis2/settings.conf']) ,'It prevents the loading of ${HOME}/.coriolis2/settings.py'])
print w print w
confFiles += [ (os.getcwd()+'/.coriolis2/settings.conf', 0) ] confFiles += [ (os.getcwd()+'/.coriolis2/settings.py', 0) ]
if helpers.xmlCompatMode: if helpers.xmlCompatMode: