summary refs log tree commit diff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-25 03:32:21 +0000
committerQMK Bot <hello@qmk.fm>2021-06-25 03:32:21 +0000
commit9d4412cb8bf9512952118b190fedea72e33d28cb (patch)
tree0aea9b18814025b73ddcc95d7d1fd7a1f33b5c06
parent0412c92b68fbc3b3d3eefd44c1b04d05b47c826a (diff)
parent7c2bd4dd88d29958b7ecc281af463257cc63fd46 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--lib/python/qmk/cli/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 32da1a9b52..7f5e0a1fa6 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -22,6 +22,7 @@ safe_commands = [
     # A list of subcommands we always run, even when the module imports fail
     'clone',
     'config',
+    'doctor',
     'env',
     'setup',
 ]
@@ -190,7 +191,7 @@ for subcommand in subcommands:
     try:
         __import__(subcommand)
 
-    except ModuleNotFoundError as e:
+    except (ImportError, ModuleNotFoundError) as e:
         if safe_command:
             print(f'Warning: Could not import {subcommand}: {e.__class__.__name__}, {e}')
         else: