summaryrefslogtreecommitdiff
path: root/lib/python/qmk
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-06 12:38:13 +0000
committerQMK Bot <hello@qmk.fm>2022-08-06 12:38:13 +0000
commit820371c31bf1afdde8294aa050f95b0434ff5fd9 (patch)
tree7a5cbd765354c9c20bf2bc7c53927cf77efc50c3 /lib/python/qmk
parentf27b617f36d55ac5469247016a1b79304f892366 (diff)
parent37345e2ace56e1ea17e0ab6b4df3af81f437ae79 (diff)
downloadqmk_firmware-820371c31bf1afdde8294aa050f95b0434ff5fd9.tar.gz
qmk_firmware-820371c31bf1afdde8294aa050f95b0434ff5fd9.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk')
-rw-r--r--lib/python/qmk/info.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 72424f390e..bc07f68d7b 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -523,10 +523,17 @@ def _extract_config_h(info_data, config_c):
key_type = info_dict.get('value_type', 'raw')
try:
+ replace_with = info_dict.get('replace_with')
if config_key in config_c and info_dict.get('invalid', False):
- _log_error(info_data, '%s in config.h is no longer a valid option' % config_key)
+ if replace_with:
+ _log_error(info_data, '%s in config.h is no longer a valid option and should be replaced with %s' % (config_key, replace_with))
+ else:
+ _log_error(info_data, '%s in config.h is no longer a valid option and should be removed' % config_key)
elif config_key in config_c and info_dict.get('deprecated', False):
- _log_warning(info_data, '%s in config.h is deprecated and will be removed at a later date' % config_key)
+ if replace_with:
+ _log_warning(info_data, '%s in config.h is deprecated in favor of %s and will be removed at a later date' % (config_key, replace_with))
+ else:
+ _log_warning(info_data, '%s in config.h is deprecated and will be removed at a later date' % config_key)
if config_key in config_c and info_dict.get('to_json', True):
if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):
@@ -589,10 +596,17 @@ def _extract_rules_mk(info_data, rules):
key_type = info_dict.get('value_type', 'raw')
try:
+ replace_with = info_dict.get('replace_with')
if rules_key in rules and info_dict.get('invalid', False):
- _log_error(info_data, '%s in rules.mk is no longer a valid option' % rules_key)
+ if replace_with:
+ _log_error(info_data, '%s in rules.mk is no longer a valid option and should be replaced with %s' % (rules_key, replace_with))
+ else:
+ _log_error(info_data, '%s in rules.mk is no longer a valid option and should be removed' % rules_key)
elif rules_key in rules and info_dict.get('deprecated', False):
- _log_warning(info_data, '%s in rules.mk is deprecated and will be removed at a later date' % rules_key)
+ if replace_with:
+ _log_warning(info_data, '%s in rules.mk is deprecated in favor of %s and will be removed at a later date' % (rules_key, replace_with))
+ else:
+ _log_warning(info_data, '%s in rules.mk is deprecated and will be removed at a later date' % rules_key)
if rules_key in rules and info_dict.get('to_json', True):
if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):