The branch, twofactorauth has been updated via 4982c1319f128dd81cd5da71ecbcf7d73312e3e6 (commit) from 29315a21584c684382d2d5eecbe10e6e263f29e3 (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 | 2 ++ x2go/xserver.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a8f88d6..d7e7c8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low startup has not yet been completed fully. - Use nxproxy-3.5.0.12 when testing Python X2Go applications. - Use VcXsrv-1.12.0.1 when testing Python X2Go applications. + - If configured X-server display port is already in use, try to detect + the next available display number. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/xserver.py b/x2go/xserver.py index d4a6b95..0ed3476 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -224,7 +224,23 @@ class X2goXServer(threading.Thread): self.xserver_name = xserver_name self.xserver_config = xserver_config self.hProcess = None + if self.xserver_config.has_key('display'): + + try: + _configured_display_no = int(self.xserver_config['display'].split(":")[1].split(".")[0]) + _xserver_port = _configured_display_no + 6000 + while utils.detect_unused_port(preferred_port=_xserver_port) != _xserver_port: + _xserver_port += 1 + _display_no = _xserver_port - 6000 + + if _configured_display_no != _display_no: + self.xserver_config['display'] = self.xserver_config['display'].replace(_configured_display_no, _display_no) + self.xserver_config['parameters'] = self.xserver_config['parameters'].replace(_configured_display_no, _display_no) + + except TypeError: + pass + self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE) os.environ.update({'DISPLAY': str(self.xserver_config['display'])}) threading.Thread.__init__(self) 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).