[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 7fc45e09dad88cdd435c6285b31cd96ae40e913a

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:19:27 CET 2014


The branch, brokerclient has been updated
       via  7fc45e09dad88cdd435c6285b31cd96ae40e913a (commit)
      from  3106c46113abf673b3d0cd9dd71a8282cc9cb449 (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 |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 7c12dcf..6f847b1 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -650,15 +650,13 @@ class X2goSession(paramiko.SSHClient):
                                      hostname=self.get_transport().getpeername(),
                                     )
 
-        self.session_info.local_container = os.path.join('%s/S-%s' % (self.params.rootdir, 
-                                                                      self.session_info.name,
-                                                        )
-                                            )
-        self.session_info.remote_container = os.path.join('%s/%s/C-%s' % (self._x2go_remote_home, 
-                                                                          _X2GO_SESSION_ROOTDIR,
-                                                                          self.session_info.name,
-                                                         )
-                                             )
+        # local path may be a Windows path, so we use the path separator of the local system
+        self.session_info.local_container = os.path.join(self.params.rootdir, self.session_info.name)
+        # remote path is always a UniX path...
+        self.session_info.remote_container = '%s/%s/C-%s' % (self._x2go_remote_home, 
+                                                             _X2GO_SESSION_ROOTDIR,
+                                                             self.session_info.name,
+                                                            )
 
         # set up SSH tunnel for X11 graphical elements
         self.proxy = self.proxy_class(session_info=self.session_info, ssh_transport=self.get_transport(), logger=self.logger)


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