This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 0.5.0.1
in repository x2goclient.
commit 817cb9b5c3bae6e23c74cdbddd1a0a6642b46c1c
Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
Date: Mon Mar 10 15:58:00 2014 +0100
If a user name can neither be detected from the session profile, nor from
the command line option, try the username used for the broker authentication.
---
debian/changelog | 9 +++++++++
pyhoca/cli/frontend.py | 6 +++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index fa21916d..e5a6f3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyhoca-cli (0.5.0.0-0x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (0.5.0.0):
+ - If a user name can neither be detected from the session profile, nor
+ from the command line option, try the username used for the broker
+ authentication.
+
+ -- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Mon, 10 Mar 2014 15:56:42
+0100
+
pyhoca-cli (0.4.0.3-0x2go1) UNRELEASED; urgency=low
* Continue development...
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index f5594288..d6481967 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -424,8 +424,12 @@ class PyHocaCLI(x2go.X2GoClient):
connected = False
force_password_auth = False
_username = self.args.username or
self._X2GoClient__get_session_username(self.x2go_session_hash)
- try:
+ # if we still don't have a valid user name, try the broker...
+ if not _username and hasattr(self.session_profiles,
'get_broker_username'):
+ _username = self.session_profiles.get_broker_username()
+
+ try:
_auth_count = self.auth_attempts +1
while not connected and _auth_count:
try:
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
