This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 921ee10 python-x2go.spec: Add dependencies: python-requests, python-simplejson. new 0ac8563 fix changelog entry new 580cb0e X2GoSessionProfile.get_server_hostname must return unicode objects. new 5eea83a fix method name The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 ++- x2go/backends/profiles/base.py | 6 +++--- x2go/backends/profiles/file.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 0ac856395bf42fc42a9b8ea9aea9f0f9d1f49cc4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 18 09:40:14 2014 +0100 fix changelog entry --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95e8c64..f9f4bf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low not really used by third-party products, if at all). - Fix setting default values in X2GoClientXConfig class. - Default to xdg-open as default PDF viewer command. - - Provide basic session profile backend for a http broker. + - Provide session profile backend for a http broker. - Make session profile backends more unicode robust. * debian/control: + Add dependencies: python-requests, python-simplejson. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 5eea83ae2ba322b79a911a112b1728464b4893ff Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 18 09:42:20 2014 +0100 fix method name --- x2go/backends/profiles/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 7275869..002124d 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -700,7 +700,7 @@ class X2GoSessionProfiles(): """ return self._get_server_port(profile_id) - def _get_server_hostname(self, profile_id): + def _get_server_port(self, profile_id): """\ Inherit from this class and provide a way for actually obtaining a the server SSH port for a given profile ID. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 580cb0ee532e34fec7f5670e2f555c2d782b85ee Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 18 09:42:08 2014 +0100 X2GoSessionProfile.get_server_hostname must return unicode objects. --- debian/changelog | 1 + x2go/backends/profiles/base.py | 4 ++-- x2go/backends/profiles/file.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9f4bf5..4052101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - Default to xdg-open as default PDF viewer command. - Provide session profile backend for a http broker. - Make session profile backends more unicode robust. + - X2GoSessionProfile.get_server_hostname must return unicode objects. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 641e5e4..7275869 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -669,7 +669,7 @@ class X2GoSessionProfiles(): @rtype: C{list} """ - return self._get_server_hostname(profile_id) + return unicode(self._get_server_hostname(profile_id)) def _get_server_hostname(self, profile_id): """\ @@ -684,7 +684,7 @@ class X2GoSessionProfiles(): @rtype: C{list} """ - return [u'localhost'] + return u'localhost' def get_server_port(self, profile_id): """\ diff --git a/x2go/backends/profiles/file.py b/x2go/backends/profiles/file.py index 0f08336..ffe3ad5 100644 --- a/x2go/backends/profiles/file.py +++ b/x2go/backends/profiles/file.py @@ -120,7 +120,7 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles, inifiles.X2GoIniFile): return [ s for s in self.iniConfig.sections() if s != "none" ] def _get_server_hostname(self, profile_id): - return self.get_profile_config(profile_id)['host'] + return random.choice(self.get_profile_config(profile_id)['host']) def _get_server_port(self, profile_id): return self.get_profile_config(profile_id)['sshport'] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org