diff options
author | Erovia <Erovia@users.noreply.github.com> | 2020-05-21 21:56:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-21 21:56:43 +0200 |
commit | 179e5c018fcee9bcb0a7f1907cc96d44ed5cf554 (patch) | |
tree | eed775035ee27babc2033eafcfb3f932c6808007 /lib/python/qmk/cli/doctor.py | |
parent | 5246acb2e4c188198d503856a493b66174486db8 (diff) | |
download | qmk_firmware-179e5c018fcee9bcb0a7f1907cc96d44ed5cf554.tar.gz qmk_firmware-179e5c018fcee9bcb0a7f1907cc96d44ed5cf554.zip |
CLI: Rework submodule checking (#9162)
Diffstat (limited to 'lib/python/qmk/cli/doctor.py')
-rwxr-xr-x | lib/python/qmk/cli/doctor.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py index 20f8650e5..011c3dd3c 100755 --- a/lib/python/qmk/cli/doctor.py +++ b/lib/python/qmk/cli/doctor.py | |||
@@ -24,7 +24,6 @@ ESSENTIAL_BINARIES = { | |||
24 | }, | 24 | }, |
25 | 'bin/qmk': {}, | 25 | 'bin/qmk': {}, |
26 | } | 26 | } |
27 | ESSENTIAL_SUBMODULES = ['lib/chibios', 'lib/lufa'] | ||
28 | 27 | ||
29 | 28 | ||
30 | def _udev_rule(vid, pid=None, *args): | 29 | def _udev_rule(vid, pid=None, *args): |
@@ -124,17 +123,11 @@ def check_submodules(): | |||
124 | 123 | ||
125 | for submodule in submodules.status().values(): | 124 | for submodule in submodules.status().values(): |
126 | if submodule['status'] is None: | 125 | if submodule['status'] is None: |
127 | if submodule['name'] in ESSENTIAL_SUBMODULES: | 126 | cli.log.error('Submodule %s has not yet been cloned!', submodule['name']) |
128 | cli.log.error('Submodule %s has not yet been cloned!', submodule['name']) | 127 | ok = False |
129 | ok = False | ||
130 | else: | ||
131 | cli.log.warn('Submodule %s is not available.', submodule['name']) | ||
132 | elif not submodule['status']: | 128 | elif not submodule['status']: |
133 | if submodule['name'] in ESSENTIAL_SUBMODULES: | 129 | cli.log.error('Submodule %s is not up to date!', submodule['name']) |
134 | cli.log.error('Submodule %s is not up to date!', submodule['name']) | 130 | ok = False |
135 | ok = False | ||
136 | else: | ||
137 | cli.log.warn('Submodule %s is not up to date!', submodule['name']) | ||
138 | 131 | ||
139 | return ok | 132 | return ok |
140 | 133 | ||