[X2go-Commits] python-x2go.git - build-main (branch) updated: 0.2.0.5

[X2Go dev team]

The branch, build-main has been updated
       via  3b1c605aceda599b49b84248308e31ee9af9af95 (commit)
       via  6bd98163227c4fc161dc438636d6941f55f39f51 (commit)
       via  4113c80b06c3a503dbe4cc4723145f74b5e98a8a (commit)
      from  b7d446e991635f3bd996c932b5da7334b85e06be (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 |    4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f759dea..638a7df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.5-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. Now the real fix!!!
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 12 Jun 2012 15:50:17 +0200
+
 python-x2go (0.2.0.4-0~x2go1) unstable; urgency=low
 
   * Bugfix release (0.2.0.4):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 4c38720..f61053f 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -178,7 +178,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.2.0.4'
+__VERSION__ = '0.2.0.5'
 
 from gevent import monkey
 monkey.patch_all()
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).