qmk_firmware

commit: 455cd65e80563469712fe56de15666e06b945636
parent 34aa53324670fd815632b203ecf08010e4cd6f72
Author: Joel Challis <git@zvecr.com>
Date:   Tue,  9 Jan 2024 09:59:36 +0000

Prevent `qmk migrate` processing unparsed info.json values (#22374)


Diffstat:
M
lib/python/qmk/cli/migrate.py
5
++++-
M
lib/python/qmk/info.py
3
+++

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/python/qmk/cli/migrate.py b/lib/python/qmk/cli/migrate.py
@@ -47,9 +47,12 @@ def migrate(cli):
     files = _candidate_files(cli.args.keyboard)
 
     # Filter down keys if requested
-    keys = info_map.keys()
+    keys = list(filter(lambda key: info_map[key].get("to_json", True), info_map.keys()))
     if cli.args.filter:
         keys = list(set(keys) & set(cli.args.filter))
+        rejected = set(cli.args.filter) - set(keys)
+        for key in rejected:
+            cli.log.info(f'{{fg_yellow}}Skipping {key} as migration not possible...')
 
     cli.log.info(f'{{fg_green}}Migrating keyboard {{fg_cyan}}{cli.args.keyboard}{{fg_green}}.{{fg_reset}}')
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
@@ -501,6 +501,9 @@ def _config_to_json(key_type, config_value):
     """Convert config value using spec
     """
     if key_type.startswith('array'):
+        if key_type.count('.') > 1:
+            raise Exception(f"Conversion of {key_type} not possible")
+
         if '.' in key_type:
             key_type, array_type = key_type.split('.', 1)
         else: