diff options
| author | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2023-04-26 16:32:15 +0800 |
| commit | e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 (patch) | |
| tree | c0a257eab0ffe5238fdf2c04882e8ee1fe8fc46e /lib/python/qmk/cli/doctor/windows.py | |
| parent | 103badc87cb50db1ff3851c84331e86ba78fb681 (diff) | |
merge upstream 713427c
Diffstat (limited to 'lib/python/qmk/cli/doctor/windows.py')
| -rw-r--r-- | lib/python/qmk/cli/doctor/windows.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/doctor/windows.py b/lib/python/qmk/cli/doctor/windows.py index 381ab36fde..26bb65374b 100644 --- a/lib/python/qmk/cli/doctor/windows.py +++ b/lib/python/qmk/cli/doctor/windows.py @@ -2,7 +2,7 @@ import platform from milc import cli -from .check import CheckStatus +from .check import CheckStatus, release_info def os_test_windows(): @@ -11,4 +11,10 @@ def os_test_windows(): win32_ver = platform.win32_ver() cli.log.info("Detected {fg_cyan}Windows %s (%s){fg_reset}.", win32_ver[0], win32_ver[1]) + # MSYS really does not like "/" files - resolve manually + file = cli.run(['cygpath', '-m', '/etc/qmk-release']).stdout.strip() + qmk_distro_version = release_info(file).get('VERSION', None) + if qmk_distro_version: + cli.log.info('QMK MSYS version: %s', qmk_distro_version) + return CheckStatus.OK |