1
0
forked from drath/libratbag

tools: unlink the dbus file if ratbagd.devel fails to start

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2017-09-29 09:07:44 +10:00
committed by Benjamin Tissoires
parent 6827f5ed81
commit d8edf2d9e4
2 changed files with 10 additions and 5 deletions

View File

@@ -42,6 +42,7 @@ def main(argv):
argv = ["list"]
cmd = None
ratbagd_process = None
try:
parser = toolbox.get_parser()
parser.want_keepalive = True

View File

@@ -102,12 +102,16 @@ def start_ratbagd(verbosity=0):
def terminate_ratbagd(ratbagd):
if ratbagd is not None:
try:
ratbagd.terminate()
ratbagd.wait(5)
except subprocess.TimeoutExpired:
ratbagd.kill()
try:
ratbagd.terminate()
ratbagd.wait(5)
except subprocess.TimeoutExpired:
ratbagd.kill()
os.unlink(DBUS_CONF_PATH)
os.unlink(DBUS_CONF_PATH)
except FileNotFoundError:
pass
def sync_dbus():