summaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/doctor/main.py
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-27 17:03:42 +0000
committerQMK Bot <hello@qmk.fm>2021-09-27 17:03:42 +0000
commitbca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6 (patch)
tree764b035dc6beebd5ced279f02d10b5b0e0720894 /lib/python/qmk/cli/doctor/main.py
parenta311514f43de7cf7bde758a691419a95367cebe2 (diff)
parentfce9cb933845bf0b74d322eba02de3b76daaeb84 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/doctor/main.py')
-rwxr-xr-xlib/python/qmk/cli/doctor/main.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py
index 6a31ccdfdd..ed20f46d3f 100755
--- a/lib/python/qmk/cli/doctor/main.py
+++ b/lib/python/qmk/cli/doctor/main.py
@@ -79,12 +79,13 @@ def doctor(cli):
cli.log.info('CLI version: %s', cli.version)
cli.log.info('QMK home: {fg_cyan}%s', QMK_FIRMWARE)
- status = os_tests()
+ status = os_status = os_tests()
+ git_status = git_tests()
- status = git_tests()
+ if git_status == CheckStatus.ERROR or (os_status == CheckStatus.OK and git_status == CheckStatus.WARNING):
+ status = git_status
- venv = in_virtualenv()
- if venv:
+ if in_virtualenv():
cli.log.info('CLI installed in virtualenv.')
# Make sure the basic CLI tools we need are available and can be executed.