[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 2212b03ad4124ba5539b03d6f092233d30314033
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:25:19 CET 2014
The branch, build-baikal has been updated
via 2212b03ad4124ba5539b03d6f092233d30314033 (commit)
from 7fc45e09dad88cdd435c6285b31cd96ae40e913a (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 | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 6f847b1..f55fdd1 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -651,7 +651,7 @@ class X2goSession(paramiko.SSHClient):
)
# 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)
+ self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % 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,
@@ -784,7 +784,7 @@ class X2goSession(paramiko.SSHClient):
if self.session_info.username not in self._x2go_remote_group('x2goprint'):
raise x2go_exceptions.X2goSessionException('remote user %s is not member of X2go server group x2goprint' % self.session_info.username)
- spool_dir = '%s/spool' % self.session_info.local_container
+ spool_dir = os.path.join(self.session_info.local_container, 'spool')
if not os.path.exists(spool_dir):
os.mkdir(spool_dir)
self.share_local_folder(folder_name=spool_dir, folder_type='spool')
@@ -1027,9 +1027,7 @@ class X2goSession(paramiko.SSHClient):
self.session_info = self.list_sessions()[session_name]
if self.session_info.name:
self.associated = True
- self.session_info.local_container = '%s/S-%s' % (self.params.rootdir,
- self.session_info.name,
- )
+ self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
except KeyError:
pass
return self.associated
@@ -1074,10 +1072,11 @@ class X2goSession(paramiko.SSHClient):
self.proxy = self.proxy_class(self.session_info, self.get_transport(), logger=self.logger)
self.proxy_subprocess = self.proxy.start()
- self.session_info.local_container = '%s/S-%s' % (self.params.rootdir,
- self.session_info.name,
- )
- self.session_info.remote_container = '%s/%s/C-%s' % (self._x2go_remote_home, _X2GO_SESSION_ROOTDIR,
+ # 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, 'S-%s' % 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,
)
return self.ok()
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