~ruther/qmk_firmware

d6c39490df2aa114b4fb0fba00b4c03b5ff3a405 — QMK Bot 3 years ago a61e549 + 9d70162
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 2 insertions(+), 2 deletions(-)

M lib/python/qmk/keymap.py
M lib/python/qmk/keymap.py => lib/python/qmk/keymap.py +2 -2
@@ 12,7 12,7 @@ from pygments.token import Token
from pygments import lex

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

# 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 = ''
    keymap_path = ''

    for dir in keyboard.split('/'):
    for dir in keyboard_folder(keyboard).split('/'):
        if checked_dirs:
            checked_dirs = '/'.join((checked_dirs, dir))
        else: