diff options
| author | Zach White <skullydazed@gmail.com> | 2021-02-27 12:00:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 12:00:50 -0800 |
| commit | 1581ea48dcd48d0d3f42cc09b388c468aedec45d (patch) | |
| tree | 2d028036a4bf80c2e47b952931544f95ba2174e9 /lib/python/qmk/os_helpers/linux/__init__.py | |
| parent | 23ed6c4ec0bfb27612da8a7b78d1b484acc23f3f (diff) | |
Fix develop (#12039)
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.
* force utf8 encoding
* correctly merge layouts and layout aliases
* show what aliases point to
Diffstat (limited to 'lib/python/qmk/os_helpers/linux/__init__.py')
| -rw-r--r-- | lib/python/qmk/os_helpers/linux/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/qmk/os_helpers/linux/__init__.py b/lib/python/qmk/os_helpers/linux/__init__.py index a04ac4f8a9..9e73964e47 100644 --- a/lib/python/qmk/os_helpers/linux/__init__.py +++ b/lib/python/qmk/os_helpers/linux/__init__.py @@ -95,7 +95,7 @@ def check_udev_rules(): # Collect all rules from the config files for rule_file in udev_rules: - for line in rule_file.read_text().split('\n'): + for line in rule_file.read_text(encoding='utf-8').split('\n'): line = line.strip() if not line.startswith("#") and len(line): current_rules.add(line) |