[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 29b4c7f2e0b4adea74994b2dc839da8ea9f05e75

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:18 CEST 2013


The branch, twofactorauth has been updated
       via  29b4c7f2e0b4adea74994b2dc839da8ea9f05e75 (commit)
      from  4bc5bfc1358b525e7b36fbe97264957be0a9fbef (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:
 x2go/session.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 7ea83e5..20a8e12 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -49,7 +49,9 @@ from cleanup import x2go_cleanup
 # for debugging code
 import pprint
 
+# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
 from defaults import LOCAL_HOME as _LOCAL_HOME
+from defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 from defaults import X2GO_SESSION_ROOTDIR as _X2GO_SESSION_ROOTDIR
 
 # options of the paramiko.SSHClient().connect()
@@ -822,7 +824,7 @@ class X2goSession(paramiko.SSHClient):
                          'x2gomountdirs', 
                          'dir',
                          str(self.session_info.name), 
-                         str(self.session_info.username),
+                         _CURRENT_LOCAL_USER,
                          _x2go_key_fname,
                          '%s__REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port),
                          'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), 
@@ -834,7 +836,7 @@ class X2goSession(paramiko.SSHClient):
                          'x2gomountdirs', 
                          'dir',
                          str(self.session_info.name), 
-                         str(self.session_info.username),
+                         _CURRENT_LOCAL_USER,
                          _x2go_key_fname,
                          '%s__PRINT_SPOOL___REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port),
                          'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), 


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).




More information about the x2go-commits mailing list