[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-230-gfccfb5c

[X2Go dev team]

The branch, twofactorauth has been updated
       via  fccfb5cdbc81a0bbea0c1ffeba57448bbd257d49 (commit)
      from  301f531414426b31db6b2196502f7c1310bb7eb4 (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/backends/terminal/_stdout.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 3ef850f..720e0e1 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -51,6 +51,7 @@ from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 from x2go.defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR
 from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
 from x2go.defaults import X2GO_GENERIC_APPLICATIONS as _X2GO_GENERIC_APPLICATIONS
+from x2go.defaults import X2GO_DESKTOPSESSIONS as _X2GO_DESKTOPSESSIONS
 
 from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
 from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
@@ -65,8 +66,8 @@ def _rewrite_cmd(cmd, params=None):
     cmd = cmd or ''
 
     # find window manager commands
-    if cmd in defaults.X2GO_DESKTOPSESSIONS.keys():
-        cmd = defaults.X2GO_DESKTOPSESSIONS[cmd]
+    if cmd in _X2GO_DESKTOPSESSIONS.keys():
+        cmd = _X2GO_DESKTOPSESSIONS[cmd]
 
     if (cmd == 'RDP') and (type(params) == X2goSessionParams):
         if params.geometry == 'fullscreen':
@@ -83,7 +84,6 @@ def _rewrite_cmd(cmd, params=None):
 
     return cmd
 
-
 def _rewrite_blanks(cmd):
     # X2Go run command replace X2GO_SPACE_CHAR string with blanks
     if cmd:
@@ -124,9 +124,9 @@ class X2goSessionParams(object):
                 self.session_type = 'R'
             elif cmd == 'XDMCP':
                 self.session_type = 'D'
-            elif cmd in defaults.X2GO_DESKTOPSESSIONS.keys():
+            elif cmd in _X2GO_DESKTOPSESSIONS.keys():
                 self.session_type = 'D'
-            elif os.path.basename(cmd) in defaults.X2GO_DESKTOPSESSIONS.values():
+            elif os.path.basename(cmd) in _X2GO_DESKTOPSESSIONS.values():
                 self.session_type = 'D'
             elif self.session_type not in ("S", "shared", "shadow"):
                 self.session_type = 'R'


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