Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug in the CLI's rules.mk parsing code #10522

Closed
wants to merge 1 commit into from
Closed

Fix a bug in the CLI's rules.mk parsing code #10522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/python/qmk/keyboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def rules_mk(keyboard):
Returns:
a dictionary representing the content of the entire rules.mk tree for a keyboard
"""
keyboard = Path(keyboard)
keyboard = orig_kb = Path(keyboard)
cur_dir = Path('keyboards')
rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')

Expand All @@ -49,6 +49,11 @@ def rules_mk(keyboard):
cur_dir = cur_dir / dir
rules = parse_rules_mk_file(cur_dir / 'rules.mk', rules)

# Removing DEFAULT_FOLDER if the full revision was specified as it can cause unexpected
# behaviour otherwise.
if 'DEFAULT_FOLDER' in rules and orig_kb not in Path(rules['DEFAULT_FOLDER']).parents:
rules.pop('DEFAULT_FOLDER')

return rules


Expand Down