diff options
author | QMK Bot <hello@qmk.fm> | 2021-06-25 03:32:21 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-06-25 03:32:21 +0000 |
commit | 9d4412cb8bf9512952118b190fedea72e33d28cb (patch) | |
tree | 0aea9b18814025b73ddcc95d7d1fd7a1f33b5c06 /lib/python | |
parent | 0412c92b68fbc3b3d3eefd44c1b04d05b47c826a (diff) | |
parent | 7c2bd4dd88d29958b7ecc281af463257cc63fd46 (diff) | |
download | qmk_firmware-9d4412cb8bf9512952118b190fedea72e33d28cb.tar.gz qmk_firmware-9d4412cb8bf9512952118b190fedea72e33d28cb.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python')
-rw-r--r-- | lib/python/qmk/cli/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py index 32da1a9b5..7f5e0a1fa 100644 --- a/lib/python/qmk/cli/__init__.py +++ b/lib/python/qmk/cli/__init__.py | |||
@@ -22,6 +22,7 @@ safe_commands = [ | |||
22 | # A list of subcommands we always run, even when the module imports fail | 22 | # A list of subcommands we always run, even when the module imports fail |
23 | 'clone', | 23 | 'clone', |
24 | 'config', | 24 | 'config', |
25 | 'doctor', | ||
25 | 'env', | 26 | 'env', |
26 | 'setup', | 27 | 'setup', |
27 | ] | 28 | ] |
@@ -190,7 +191,7 @@ for subcommand in subcommands: | |||
190 | try: | 191 | try: |
191 | __import__(subcommand) | 192 | __import__(subcommand) |
192 | 193 | ||
193 | except ModuleNotFoundError as e: | 194 | except (ImportError, ModuleNotFoundError) as e: |
194 | if safe_command: | 195 | if safe_command: |
195 | print(f'Warning: Could not import {subcommand}: {e.__class__.__name__}, {e}') | 196 | print(f'Warning: Could not import {subcommand}: {e.__class__.__name__}, {e}') |
196 | else: | 197 | else: |