[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.4-2-g6bd9816

[X2Go dev team]

The branch, master has been updated
       via  6bd98163227c4fc161dc438636d6941f55f39f51 (commit)
      from  4113c80b06c3a503dbe4cc4723145f74b5e98a8a (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 6bd98163227c4fc161dc438636d6941f55f39f51
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 12 15:50:08 2012 +0200

    Fix for building Python X2Go in pbuilder environment. Catch Xlib.error.DisplayConnectionError and ignore it. Now the real fix!!!

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

Summary of changes:
 debian/changelog |    4 +++-
 x2go/defaults.py |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 79319c2..27d8c56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-x2go (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Bugfix release (0.2.0.4):
+    - Fix for building Python X2Go in pbuilder environment. Catch
+      Xlib.error.DisplayConnectionError and ignore it. Now the real fix!!!
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 12 Jun 2012 10:10:29 +0200
 
diff --git a/x2go/defaults.py b/x2go/defaults.py
index b106225..350a288 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -40,7 +40,9 @@ if X2GOCLIENT_OS != 'Windows':
     # handle missing X displays on package build
     try:
         X_DISPLAY = Xlib.display.Display()
-    except Xlib.error.DisplayNameError, Xlib.error.DisplayConnectionError:
+    except Xlib.error.DisplayNameError:
+	X_DISPLAY = None
+    except Xlib.error.DisplayConnectionError:
         X_DISPLAY = None
 
 LOCAL_HOME = os.path.normpath(os.path.expanduser('~'))


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).