diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
commit | bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6 (patch) | |
tree | 764b035dc6beebd5ced279f02d10b5b0e0720894 /lib/python/qmk/cli/doctor/linux.py | |
parent | a311514f43de7cf7bde758a691419a95367cebe2 (diff) | |
parent | fce9cb933845bf0b74d322eba02de3b76daaeb84 (diff) | |
download | qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.tar.gz qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli/doctor/linux.py')
-rw-r--r-- | lib/python/qmk/cli/doctor/linux.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/doctor/linux.py b/lib/python/qmk/cli/doctor/linux.py index 6ce00f6ef..94683d330 100644 --- a/lib/python/qmk/cli/doctor/linux.py +++ b/lib/python/qmk/cli/doctor/linux.py | |||
@@ -118,10 +118,9 @@ def check_udev_rules(): | |||
118 | cli.log.warning("{fg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader) | 118 | cli.log.warning("{fg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader) |
119 | else: | 119 | else: |
120 | # For caterina, check if ModemManager is running | 120 | # For caterina, check if ModemManager is running |
121 | if bootloader == "caterina": | 121 | if bootloader == "caterina" and check_modem_manager(): |
122 | if check_modem_manager(): | 122 | cli.log.warning("{fg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.") |
123 | rc = CheckStatus.WARNING | 123 | |
124 | cli.log.warning("{fg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.") | ||
125 | rc = CheckStatus.WARNING | 124 | rc = CheckStatus.WARNING |
126 | cli.log.warning("{fg_yellow}Missing or outdated udev rules for '%s' boards. Run 'sudo cp %s/util/udev/50-qmk.rules /etc/udev/rules.d/'.", bootloader, QMK_FIRMWARE) | 125 | cli.log.warning("{fg_yellow}Missing or outdated udev rules for '%s' boards. Run 'sudo cp %s/util/udev/50-qmk.rules /etc/udev/rules.d/'.", bootloader, QMK_FIRMWARE) |
127 | 126 | ||
@@ -167,6 +166,5 @@ def os_test_linux(): | |||
167 | return CheckStatus.OK | 166 | return CheckStatus.OK |
168 | else: | 167 | else: |
169 | cli.log.info("Detected {fg_cyan}Linux{fg_reset}.") | 168 | cli.log.info("Detected {fg_cyan}Linux{fg_reset}.") |
170 | from .linux import check_udev_rules | ||
171 | 169 | ||
172 | return check_udev_rules() | 170 | return check_udev_rules() |