Changed how init_project.py detects if S++ has been updated.
This commit is contained in:
parent
0d9c25cf45
commit
ee12876350
@ -44,11 +44,12 @@ def update_spp() -> None:
|
|||||||
try:
|
try:
|
||||||
exec_checked(['git', 'fetch', 'origin', 'master'])
|
exec_checked(['git', 'fetch', 'origin', 'master'])
|
||||||
exec_checked(['git', 'checkout', 'master'])
|
exec_checked(['git', 'checkout', 'master'])
|
||||||
output = exec_get_output(['git', 'status', '--porcelain'])
|
exec_checked(['git', 'pull'])
|
||||||
if output.strip() == '':
|
|
||||||
return
|
|
||||||
finally:
|
finally:
|
||||||
os.chdir(_root)
|
os.chdir(_root)
|
||||||
|
output = exec_get_output(['git', 'status', '--porcelain'])
|
||||||
|
if output.strip() == '':
|
||||||
|
return
|
||||||
_logger.info('Changes in SCons++ detected, creating commit.')
|
_logger.info('Changes in SCons++ detected, creating commit.')
|
||||||
exec_checked(['git', 'commit', '-m', 'Updated Scons++', 'external/scons-plus-plus'])
|
exec_checked(['git', 'commit', '-m', 'Updated Scons++', 'external/scons-plus-plus'])
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user