Fixed X11 server check without xdpyinfo

belsander · intelliops · commit 6646b2d2db60 · 2018-12-06T12:14:19.000+01:00
Possible that xdpyinfo is not present on the system, then checkXServer fails. First sanity check, then perform xdpyinfo.
diff --git a/common/tools.py b/common/tools.py
@@ -449,11 +449,14 @@ def checkXServer():
     Returns:
         bool:   ``True`` if X11 server is running
     """
-    proc = subprocess.Popen(['xdpyinfo'],
-                            stdout = subprocess.DEVNULL,
-                            stderr = subprocess.DEVNULL)
-    proc.communicate()
-    return proc.returncode == 0
+    if which('xdpyinfo') is not None:
+        proc = subprocess.Popen(['xdpyinfo'],
+                                stdout = subprocess.DEVNULL,
+                                stderr = subprocess.DEVNULL)
+        proc.communicate()
+        return proc.returncode == 0
+    else:
+        return False
 
 def preparePath(path):
     """
