summaryrefslogtreecommitdiff
path: root/lib/python/qmk/os_helpers/__init__.py
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-06-29 12:23:03 -0700
committerDrashna Jael're <drashna@live.com>2021-06-29 12:24:07 -0700
commitacf2c323e2927f6007b17ded577cf49fd86fec6c (patch)
tree8334dc5c71e6ab9bf33c76143eac7bb0e60159b0 /lib/python/qmk/os_helpers/__init__.py
parentec7a7beeed3046e9144d4c4ce0ef3b2c4f9e4341 (diff)
parentf55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff)
Merge upstream QMK Firmware at '0.12.52~1'
Diffstat (limited to 'lib/python/qmk/os_helpers/__init__.py')
-rw-r--r--lib/python/qmk/os_helpers/__init__.py5
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 3f64a63a3a..3e98db3c32 100644
--- a/lib/python/qmk/os_helpers/__init__.py
+++ b/lib/python/qmk/os_helpers/__init__.py
@@ -3,10 +3,9 @@
from enum import Enum
import re
import shutil
-import subprocess
+from subprocess import DEVNULL
from milc import cli
-from qmk.commands import run
from qmk import submodules
from qmk.constants import QMK_FIRMWARE
@@ -142,7 +141,7 @@ def is_executable(command):
# Make sure the command can be executed
version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version')
- check = run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=5, universal_newlines=True)
+ check = cli.run([command, version_arg], combined_output=True, stdin=DEVNULL, timeout=5)
ESSENTIAL_BINARIES[command]['output'] = check.stdout