[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-89-g5748487

[X2go dev team]

The branch, master has been updated
       via  574848749ccb463a497b4d89b983151651c5c54f (commit)
      from  3db6c3936fd436a7f78cae846b8fa41c83c5ab29 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 574848749ccb463a497b4d89b983151651c5c54f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 19 15:48:10 2011 +0100

    handle missing X display on package build

-----------------------------------------------------------------------

Summary of changes:
 x2go/defaults.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index b6b5997..cc5bde9 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -38,7 +38,12 @@ import utils
 X2GOCLIENT_OS = platform.system()
 
 import Xlib.display
-X_DISPLAY = Xlib.display.Display()
+
+# handle missing X displays on package build
+try:
+    X_DISPLAY = Xlib.display.Display()
+except Xlib.error.DisplayNameError:
+    X_DISPLAY = None
 
 LOCAL_HOME = os.path.expanduser('~')
 X2GO_SESSIONS_ROOTDIR = '.x2go'


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).