This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit eee39178b7255c7e710d76a849bbc66fd575dbd9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 20 09:25:12 2014 +0200 More reliably handle errors in a given --broker-url option value. --- debian/changelog | 1 + pyhoca/wxgui/frontend.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83260b7..0cfc589 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low - pyhoca-gui.desktop: Set Categories: to Network;RemoteAccess;. - setup.py: Install .mo files into DESTDIR. - brokerlogin.py: Fix parameter error when evoking message box. + - More reliably handle errors in a given --broker-url option value. * debian/control: + Add D (bin:package pyhoca-gui): python-cups. (Fixes: #460). * pyhoca-gui.spec: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 6aba1de..c59c1c3 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -21,6 +21,7 @@ modules ={} import os +import re # Python X2Go import x2go @@ -201,9 +202,13 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self.broker_autoconnect = self.args.broker_autoconnect if self.args.broker_url: - if self.args.broker_url in ('HTTP', 'SSH'): - self.broker_autoconnect = True _x2goclient_kwargs['broker_url'] = self.args.broker_url + if not re.match('^(http://|https://|ssh://).*', self.args.broker_url): + self.broker_autoconnect = True + else: + if not re.match('(http|ssh)', self.args.broker_url.lower()): + # fall back broker mode... -> HTTP (and trigger querying for the exact URL) + _x2goclient_kwargs['broker_url'] = 'HTTP' self.with_brokerage = True else: self.with_brokerage = False -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git