Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
Drashna Jael're 2022-03-26 13:37:01 -07:00
commit 80102c0e83
No known key found for this signature in database
GPG key ID: DBA1FD3A860D1B11
12 changed files with 56 additions and 49 deletions

View file

@ -759,9 +759,9 @@ def find_info_json(keyboard):
# Add in parent folders for least specific
for _ in range(5):
info_jsons.append(keyboard_parent / 'info.json')
if keyboard_parent.parent == base_path:
if keyboard_parent == base_path:
break
info_jsons.append(keyboard_parent / 'info.json')
keyboard_parent = keyboard_parent.parent
# Return a list of the info.json files that actually exist