Allow locate_keymap to handle DEFAULT_FOLDER (#17529)

This commit is contained in:
Joel Challis 2022-07-01 22:20:32 +01:00 committed by GitHub
parent 2757251218
commit 9d70162d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,7 +12,7 @@ from pygments.token import Token
from pygments import lex from pygments import lex
import qmk.path import qmk.path
from qmk.keyboard import find_keyboard_from_dir, rules_mk from qmk.keyboard import find_keyboard_from_dir, rules_mk, keyboard_folder
from qmk.errors import CppError from qmk.errors import CppError
# The `keymap.c` template to use when a keyboard doesn't have its own # The `keymap.c` template to use when a keyboard doesn't have its own
@ -357,7 +357,7 @@ def locate_keymap(keyboard, keymap):
checked_dirs = '' checked_dirs = ''
keymap_path = '' keymap_path = ''
for dir in keyboard.split('/'): for dir in keyboard_folder(keyboard).split('/'):
if checked_dirs: if checked_dirs:
checked_dirs = '/'.join((checked_dirs, dir)) checked_dirs = '/'.join((checked_dirs, dir))
else: else: