From 510138f525a5ba216a170a0e0e94a4cf940a0c67 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Sat, 11 Jul 2020 12:52:36 +1000
Subject: [PATCH] Simplify doctor rule checking

---
 lib/python/qmk/cli/doctor.py | 67 +++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 46a2180b22..81b27216ef 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -149,31 +149,29 @@ def check_udev_rules():
     ok = True
     udev_dir = Path("/etc/udev/rules.d/")
     desired_rules = {
-        'qmk': {
-            # Atmel DFU
-            _udev_rule("03EB", "2FEF"), # ATmega16U2
-            _udev_rule("03EB", "2FF0"), # ATmega32U2
-            _udev_rule("03EB", "2FF3"), # ATmega16U4
-            _udev_rule("03EB", "2FF4"), # ATmega32U4
-            _udev_rule("03EB", "2FF9"), # AT90USB64
-            _udev_rule("03EB", "2FFB"), # AT90USB128
-            # Kiibohd bootloader
-            _udev_rule("1C11", "B007"),
-            # STM32duino
-            _udev_rule("1EAF", "0003"),
-            # STM32 DFU
-            _udev_rule("0483", "DF11"),
-            # BootloadHID
-            _udev_rule("16C0", "05DF"),
-            # USBAspLoader
-            _udev_rule("16C0", "05DC"),
-            # Atmel SAM-Ba (Massdrop)
-            _udev_rule("03EB", "6124"),
-            # Caterina (Pro Micro)
-            _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Sparkfun
-            _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Arduino SA
-            _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # dog hunter AG
-        }
+        # Atmel DFU
+        _udev_rule("03EB", "2FEF"), # ATmega16U2
+        _udev_rule("03EB", "2FF0"), # ATmega32U2
+        _udev_rule("03EB", "2FF3"), # ATmega16U4
+        _udev_rule("03EB", "2FF4"), # ATmega32U4
+        _udev_rule("03EB", "2FF9"), # AT90USB64
+        _udev_rule("03EB", "2FFB"), # AT90USB128
+        # Kiibohd bootloader
+        _udev_rule("1C11", "B007"),
+        # STM32duino
+        _udev_rule("1EAF", "0003"),
+        # STM32 DFU
+        _udev_rule("0483", "DF11"),
+        # BootloadHID
+        _udev_rule("16C0", "05DF"),
+        # USBAspLoader
+        _udev_rule("16C0", "05DC"),
+        # Atmel SAM-Ba (Massdrop)
+        _udev_rule("03EB", "6124"),
+        # Caterina (Pro Micro)
+        _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Sparkfun
+        _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Arduino SA
+        _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # dog hunter AG
     }
 
     # These rules are no longer recommended, only use them to check for their presence.
@@ -197,18 +195,17 @@ def check_udev_rules():
                     current_rules.add(line)
 
         # Check if the desired rules are among the currently present rules
-        for bootloader, rules in desired_rules.items():
+        for rules in desired_rules.items():
             # For caterina, check if ModemManager is running
-            if bootloader == "caterina":
-                if check_modem_manager():
-                    ok = False
-                    cli.log.warn("{bg_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.")
+            if check_modem_manager():
+                ok = False
+                cli.log.warn("{bg_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.")
             if not rules.issubset(current_rules):
-                deprecated_rule = deprecated_rules.get(bootloader)
-                if deprecated_rule and deprecated_rule.issubset(current_rules):
-                    cli.log.warn("{bg_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)
-                else:
-                    cli.log.warn("{bg_yellow}Missing udev rules for '%s' boards. You'll need to use `sudo` in order to flash them.", bootloader)
+                for bootloader, rules in deprecated_rules.items():
+                    if deprecated_rule and deprecated_rule.issubset(current_rules):
+                        cli.log.warn("{bg_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)
+                    else:
+                        cli.log.warn("{bg_yellow}Missing udev rules for '%s' boards. You'll need to use `sudo` in order to flash them.", bootloader)
 
     return ok