procutil: extend gui test to detect wayland session (issue6479) stable
authorYuya Nishihara <yuya@tcha.org>
Thu, 04 Feb 2021 19:56:45 +0900
branchstable
changeset 46361 128a17d8436f
parent 46360 33dbc9f785e7
child 46362 32da58916fd0
procutil: extend gui test to detect wayland session (issue6479)
mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py	Tue Feb 02 23:44:44 2021 +0530
+++ b/mercurial/utils/procutil.py	Thu Feb 04 19:56:45 2021 +0900
@@ -546,7 +546,11 @@
             # pure build; use a safe default
             return True
     else:
-        return pycompat.iswindows or encoding.environ.get(b"DISPLAY")
+        return (
+            pycompat.iswindows
+            or encoding.environ.get(b"DISPLAY")
+            or encoding.environ.get(b"WAYLAND_DISPLAY")
+        )
 
 
 def gui():