python-x2go.git - build-main (branch) updated: 0.2.0.4 - x2go-commits

12 Jun 2012

The branch, build-main has been updated
       via  0f580320d11864c7182447777d5c43205c9ebc4f (commit)
       via  b52960780d10c3bd4fa29fb566573b3c441c8692 (commit)
       via  a4374c61920318d9e76f3a6966e4485a9076e78e (commit)
      from  ac55fa9376d7df1224e5017f910c7de49e1ad8f5 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    8 ++++++++
 x2go/__init__.py |    2 +-
 x2go/defaults.py |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index d105c48..f759dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.4-0~x2go1) unstable; urgency=low
+
+  * 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>  Tue, 12 Jun 2012 10:09:26 +0200
+
 python-x2go (0.2.0.3-0~x2go1) unstable; urgency=low
 
   * Bugfix release (0.2.0.3):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index e27c4bb..4c38720 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -178,7 +178,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.2.0.3'
+__VERSION__ = '0.2.0.4'
 
 from gevent import monkey
 monkey.patch_all()
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).

    