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

mailcap-server.py

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