aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/userspace.py
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2025-05-05 03:43:14 +0100
committerGitHub <[email protected]>2025-05-05 03:43:14 +0100
commit614b631ee2649de67a830a39393af416acee58a8 (patch)
tree8d3b7b316ba3459519bc01a1104df4c279b398a4 /lib/python/qmk/userspace.py
parent5611a4006493eb0ec7cf815d4a7a24a671a16df6 (diff)
downloadqmk_firmware-614b631ee2649de67a830a39393af416acee58a8.tar.gz
qmk_firmware-614b631ee2649de67a830a39393af416acee58a8.zip
Ensure `qmk_userspace_paths` maintains detected order (#25204)
Diffstat (limited to 'lib/python/qmk/userspace.py')
-rw-r--r--lib/python/qmk/userspace.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/python/qmk/userspace.py b/lib/python/qmk/userspace.py
index 1c2a97f9c1..881490f796 100644
--- a/lib/python/qmk/userspace.py
+++ b/lib/python/qmk/userspace.py
@@ -12,29 +12,30 @@ from qmk.json_encoders import UserspaceJSONEncoder
def qmk_userspace_paths():
- test_dirs = set()
+ test_dirs = []
# If we're already in a directory with a qmk.json and a keyboards or layouts directory, interpret it as userspace
if environ.get('ORIG_CWD') is not None:
current_dir = Path(environ['ORIG_CWD'])
while len(current_dir.parts) > 1:
if (current_dir / 'qmk.json').is_file():
- test_dirs.add(current_dir)
+ test_dirs.append(current_dir)
current_dir = current_dir.parent
# If we have a QMK_USERSPACE environment variable, use that
if environ.get('QMK_USERSPACE') is not None:
current_dir = Path(environ['QMK_USERSPACE']).expanduser()
if current_dir.is_dir():
- test_dirs.add(current_dir)
+ test_dirs.append(current_dir)
# If someone has configured a directory, use that
if cli.config.user.overlay_dir is not None:
current_dir = Path(cli.config.user.overlay_dir).expanduser().resolve()
if current_dir.is_dir():
- test_dirs.add(current_dir)
+ test_dirs.append(current_dir)
- return list(test_dirs)
+ # remove duplicates while maintaining the current order
+ return list(dict.fromkeys(test_dirs))
def qmk_userspace_validate(path):