summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-18 17:25:01 +0000
committerQMK Bot <hello@qmk.fm>2021-03-18 17:25:01 +0000
commit90b1e271a8178d68e8c1be0beecfb26b42767f5f (patch)
tree220aeb9d60900cd63243d468e588ae9a99ff211c
parentd97a9fb4ff71cb123708389896e4fa6f70e0cb42 (diff)
parent69eca63a84e3c9017a15266e9c4be24cdb10e964 (diff)
downloadqmk_firmware-90b1e271a8178d68e8c1be0beecfb26b42767f5f.tar.gz
qmk_firmware-90b1e271a8178d68e8c1be0beecfb26b42767f5f.zip
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-xlib/python/qmk/cli/doctor.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 28d480707c..9210737f1e 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -31,16 +31,22 @@ def os_tests():
def os_test_linux():
"""Run the Linux specific tests.
"""
- cli.log.info("Detected {fg_cyan}Linux.")
- from qmk.os_helpers.linux import check_udev_rules
+ # Don't bother with udev on WSL, for now
+ if 'microsoft' in platform.uname().release.lower():
+ cli.log.info("Detected {fg_cyan}Linux (WSL){fg_reset}.")
- return check_udev_rules()
+ return CheckStatus.OK
+ else:
+ cli.log.info("Detected {fg_cyan}Linux{fg_reset}.")
+ from qmk.os_helpers.linux import check_udev_rules
+
+ return check_udev_rules()
def os_test_macos():
"""Run the Mac specific tests.
"""
- cli.log.info("Detected {fg_cyan}macOS.")
+ cli.log.info("Detected {fg_cyan}macOS{fg_reset}.")
return CheckStatus.OK
@@ -48,7 +54,7 @@ def os_test_macos():
def os_test_windows():
"""Run the Windows specific tests.
"""
- cli.log.info("Detected {fg_cyan}Windows.")
+ cli.log.info("Detected {fg_cyan}Windows{fg_reset}.")
return CheckStatus.OK