The branch, release/0.4.0.x has been updated via 0e2414813e0d7c9e75ac4738eef975188b2589cb (commit) from 9acddeaa5b703f7f9e545a10c57489d7cd9c1b93 (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/__init__.py | 2 ++ x2go/defaults.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index 27567a6..ce419f3 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -176,3 +176,5 @@ from cleanup import x2go_cleanup from defaults import X2GOCLIENT_OS from defaults import CURRENT_LOCAL_USER +from defaults import X2GO_SESSION_ROOTDIR +from defaults import X2GO_SSH_ROOTDIR diff --git a/x2go/defaults.py b/x2go/defaults.py index 3e37984..3f292ef 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -35,24 +35,28 @@ import platform X2GOCLIENT_OS = platform.system() LOCAL_HOME = os.path.expanduser('~') +X2GO_SESSION_ROOTDIR = '.x2go' +X2GO_CLIENT_ROOTDIR = '.x2goclient' + # setting OS dependent variables if X2GOCLIENT_OS == "Windows": import win32api CURRENT_LOCAL_USER = win32api.GetUserName() + X2GO_SSH_ROOTDIR = '.x2go/.ssh' + elif X2GOCLIENT_OS == "Linux": import getpass CURRENT_LOCAL_USER = getpass.getuser() + X2GO_SSH_ROOTDIR = '.ssh' elif X2GOCLIENT_OS == "Mac": import getpass CURRENT_LOCAL_USER = getpass.getuser() + X2GO_SSH_ROOTDIR = '.ssh' else: import exceptions class OSNotSupportedException(exceptions.StandardError): pass raise OSNotSupportedException('Platform %s is not supported' % platform.system()) -X2GO_SESSION_ROOTDIR = '.x2go' -X2GO_CLIENT_ROOTDIR = '.x2goclient' - ## ## X2go Printing 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).