Correct again for nightly build.
This commit is contained in:
parent
100342e640
commit
db54e685f7
|
@ -134,20 +134,20 @@ def setupPaths ( verbose ):
|
||||||
, Path( '/soc/coriolis2' )
|
, Path( '/soc/coriolis2' )
|
||||||
, Path( '/usr' )
|
, Path( '/usr' )
|
||||||
]
|
]
|
||||||
if scriptPath.match('nightly/coriolis-2.x'):
|
print( scriptPath )
|
||||||
topDirs.append( homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' )
|
for part in scriptPath.parts:
|
||||||
|
if part == 'nightly':
|
||||||
|
topDirs.append( homeDir / 'nightly' / 'coriolis-2.x' / osDir / buildType / 'install' )
|
||||||
|
break
|
||||||
if verbose:
|
if verbose:
|
||||||
print( ' o Self locating Coriolis:' )
|
print( ' o Self locating Coriolis:' )
|
||||||
coriolisTop = None
|
coriolisTop = None
|
||||||
for topDir in topDirs:
|
for topDir in topDirs:
|
||||||
if not coriolisTop:
|
if coriolisTop or not (topDir / 'bin' / 'cgt').is_file():
|
||||||
if (topDir / 'bin' / 'cgt').is_file():
|
if verbose: print( ' - {}'.format(topDir) )
|
||||||
if verbose:
|
continue
|
||||||
print( ' - {} *'.format(topDir) )
|
if verbose: print( ' - {} *'.format(topDir) )
|
||||||
coriolisTop = topDir
|
coriolisTop = topDir
|
||||||
else:
|
|
||||||
if verbose:
|
|
||||||
print( ' - {}'.format(topDir) )
|
|
||||||
if not coriolisTop:
|
if not coriolisTop:
|
||||||
print( '[ERROR] environment.setupPaths(): Unable to locate Coriolis.' )
|
print( '[ERROR] environment.setupPaths(): Unable to locate Coriolis.' )
|
||||||
return False
|
return False
|
||||||
|
|
Loading…
Reference in New Issue