The branch, master has been updated via 0f580320d11864c7182447777d5c43205c9ebc4f (commit) via b52960780d10c3bd4fa29fb566573b3c441c8692 (commit) from a4374c61920318d9e76f3a6966e4485a9076e78e (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 0f580320d11864c7182447777d5c43205c9ebc4f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 12 10:09:35 2012 +0200 release 0.2.0.4 commit b52960780d10c3bd4fa29fb566573b3c441c8692 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 12 10:09:24 2012 +0200 Fix for building Python X2Go in pbuilder environment. Catch Xlib.error.DisplayConnectionError and ignore it. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++++--- x2go/defaults.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dad5a78..f759dea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -python-x2go (0.2.0.4-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.4-0~x2go1) unstable; 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. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 10 Jun 2012 21:50:33 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 12 Jun 2012 10:09:26 +0200 python-x2go (0.2.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/defaults.py b/x2go/defaults.py index 5372a6e..5fca45c 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -40,7 +40,7 @@ if X2GOCLIENT_OS != 'Windows': # handle missing X displays on package build try: X_DISPLAY = Xlib.display.Display() - except Xlib.error.DisplayNameError: + except Xlib.error.DisplayNameError, Xlib.error.DisplayConncetionError: 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).