diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-02 22:00:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 09:00:29 +1100 |
| commit | 3a5a4c708f4817919d9fe7396ceb2b8e57d2e68e (patch) | |
| tree | 597cc9fb67dfd7f8eec088af0cd8a1e1e10c8a32 /lib/python/qmk/cli | |
| parent | 0f5500182ca00907045bcb1cd870616b5a3bee11 (diff) | |
Report submodule status when not valid work-tree (#19474)
Diffstat (limited to 'lib/python/qmk/cli')
| -rw-r--r-- | lib/python/qmk/cli/doctor/check.py | 2 | ||||
| -rwxr-xr-x | lib/python/qmk/cli/doctor/main.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/doctor/check.py b/lib/python/qmk/cli/doctor/check.py index 8a0422ba72..a368242fdb 100644 --- a/lib/python/qmk/cli/doctor/check.py +++ b/lib/python/qmk/cli/doctor/check.py | |||
| @@ -119,10 +119,8 @@ def check_submodules(): | |||
| 119 | """ | 119 | """ |
| 120 | for submodule in submodules.status().values(): | 120 | for submodule in submodules.status().values(): |
| 121 | if submodule['status'] is None: | 121 | if submodule['status'] is None: |
| 122 | cli.log.error('Submodule %s has not yet been cloned!', submodule['name']) | ||
| 123 | return CheckStatus.ERROR | 122 | return CheckStatus.ERROR |
| 124 | elif not submodule['status']: | 123 | elif not submodule['status']: |
| 125 | cli.log.warning('Submodule %s is not up to date!', submodule['name']) | ||
| 126 | return CheckStatus.WARNING | 124 | return CheckStatus.WARNING |
| 127 | 125 | ||
| 128 | return CheckStatus.OK | 126 | return CheckStatus.OK |
diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py index 1600ab8dd4..d55a11e5fd 100755 --- a/lib/python/qmk/cli/doctor/main.py +++ b/lib/python/qmk/cli/doctor/main.py | |||
| @@ -142,7 +142,7 @@ def doctor(cli): | |||
| 142 | if sub_ok == CheckStatus.OK: | 142 | if sub_ok == CheckStatus.OK: |
| 143 | cli.log.info('Submodules are up to date.') | 143 | cli.log.info('Submodules are up to date.') |
| 144 | else: | 144 | else: |
| 145 | if yesno('Would you like to clone the submodules?', default=True): | 145 | if git_check_repo() and yesno('Would you like to clone the submodules?', default=True): |
| 146 | submodules.update() | 146 | submodules.update() |
| 147 | sub_ok = check_submodules() | 147 | sub_ok = check_submodules() |
| 148 | 148 | ||
