diff options
Diffstat (limited to 'lib/python/qmk/os_helpers/__init__.py')
| -rw-r--r-- | lib/python/qmk/os_helpers/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/python/qmk/os_helpers/__init__.py b/lib/python/qmk/os_helpers/__init__.py index 3f64a63a3..3e98db3c3 100644 --- a/lib/python/qmk/os_helpers/__init__.py +++ b/lib/python/qmk/os_helpers/__init__.py | |||
| @@ -3,10 +3,9 @@ | |||
| 3 | from enum import Enum | 3 | from enum import Enum |
| 4 | import re | 4 | import re |
| 5 | import shutil | 5 | import shutil |
| 6 | import subprocess | 6 | from subprocess import DEVNULL |
| 7 | 7 | ||
| 8 | from milc import cli | 8 | from milc import cli |
| 9 | from qmk.commands import run | ||
| 10 | from qmk import submodules | 9 | from qmk import submodules |
| 11 | from qmk.constants import QMK_FIRMWARE | 10 | from qmk.constants import QMK_FIRMWARE |
| 12 | 11 | ||
| @@ -142,7 +141,7 @@ def is_executable(command): | |||
| 142 | 141 | ||
| 143 | # Make sure the command can be executed | 142 | # Make sure the command can be executed |
| 144 | version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version') | 143 | version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version') |
| 145 | check = run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=5, universal_newlines=True) | 144 | check = cli.run([command, version_arg], combined_output=True, stdin=DEVNULL, timeout=5) |
| 146 | 145 | ||
| 147 | ESSENTIAL_BINARIES[command]['output'] = check.stdout | 146 | ESSENTIAL_BINARIES[command]['output'] = check.stdout |
| 148 | 147 | ||
