Merge branch 'master' of ssh://imaginaerraum.de:2201/apo/mailcap-agent

This commit is contained in:
Lynn Ochs 2019-06-12 18:13:03 +02:00
commit 64400a1ade

View File

@ -172,7 +172,7 @@ if __name__ == "__main__":
try: try:
os.kill(pid, 3) os.kill(pid, 3)
except ProcessLookupError as e: except ProcessLookupError as e:
if args.action == 'kill': if not args.force:
print("Failed to kill process with pid %d:" % (pid,), str(e)) print("Failed to kill process with pid %d:" % (pid,), str(e))
os.remove(args.pid) os.remove(args.pid)
if os.path.exists(args.socket): if os.path.exists(args.socket):