summaryrefslogtreecommitdiff
path: root/lib/python/qmk/os_helpers/linux
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/qmk/os_helpers/linux')
-rw-r--r--lib/python/qmk/os_helpers/linux/__init__.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/python/qmk/os_helpers/linux/__init__.py b/lib/python/qmk/os_helpers/linux/__init__.py
index 86850bf284..de38f1d609 100644
--- a/lib/python/qmk/os_helpers/linux/__init__.py
+++ b/lib/python/qmk/os_helpers/linux/__init__.py
@@ -5,7 +5,6 @@ import shutil
from milc import cli
from qmk.constants import QMK_FIRMWARE
-from qmk.commands import run
from qmk.os_helpers import CheckStatus
@@ -48,6 +47,10 @@ def check_udev_rules():
_udev_rule("03eb", "2ff3"), # ATmega16U4
_udev_rule("03eb", "2ff4"), # ATmega32U4
_udev_rule("03eb", "2ff9"), # AT90USB64
+<<<<<<< HEAD
+=======
+ _udev_rule("03eb", "2ffa"), # AT90USB162
+>>>>>>> 0.12.52~1
_udev_rule("03eb", "2ffb") # AT90USB128
},
'kiibohd': {_udev_rule("1c11", "b007")},
@@ -94,7 +97,11 @@ def check_udev_rules():
# Collect all rules from the config files
for rule_file in udev_rules:
+<<<<<<< HEAD
for line in rule_file.read_text().split('\n'):
+=======
+ for line in rule_file.read_text(encoding='utf-8').split('\n'):
+>>>>>>> 0.12.52~1
line = line.strip()
if not line.startswith("#") and len(line):
current_rules.add(line)
@@ -131,7 +138,11 @@ def check_modem_manager():
"""
if check_systemd():
+<<<<<<< HEAD
mm_check = run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
+=======
+ mm_check = cli.run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
+>>>>>>> 0.12.52~1
if mm_check.returncode == 0:
return True
else: