Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
0bcd20162f
3 changed files with 11 additions and 17 deletions
|
|
@ -119,10 +119,8 @@ def check_submodules():
|
|||
"""
|
||||
for submodule in submodules.status().values():
|
||||
if submodule['status'] is None:
|
||||
cli.log.error('Submodule %s has not yet been cloned!', submodule['name'])
|
||||
return CheckStatus.ERROR
|
||||
elif not submodule['status']:
|
||||
cli.log.warning('Submodule %s is not up to date!', submodule['name'])
|
||||
return CheckStatus.WARNING
|
||||
|
||||
return CheckStatus.OK
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ def doctor(cli):
|
|||
if sub_ok == CheckStatus.OK:
|
||||
cli.log.info('Submodules are up to date.')
|
||||
else:
|
||||
if yesno('Would you like to clone the submodules?', default=True):
|
||||
if git_check_repo() and yesno('Would you like to clone the submodules?', default=True):
|
||||
submodules.update()
|
||||
sub_ok = check_submodules()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue