The branch, release/0.4.0.x has been updated via 9acddeaa5b703f7f9e545a10c57489d7cd9c1b93 (commit) from 9f02d57f47f047e6b4055e257396549b87d363ab (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 | 1 + x2go/defaults.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index 88bfa03..27567a6 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -175,3 +175,4 @@ from log import * from cleanup import x2go_cleanup from defaults import X2GOCLIENT_OS +from defaults import CURRENT_LOCAL_USER diff --git a/x2go/defaults.py b/x2go/defaults.py index 8e7e22f..3e37984 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -37,9 +37,18 @@ X2GOCLIENT_OS = platform.system() LOCAL_HOME = os.path.expanduser('~') # setting OS dependent variables if X2GOCLIENT_OS == "Windows": - CURRENT_LOCAL_USER = os.environ['USERNAME'] + import win32api + CURRENT_LOCAL_USER = win32api.GetUserName() +elif X2GOCLIENT_OS == "Linux": + import getpass + CURRENT_LOCAL_USER = getpass.getuser() +elif X2GOCLIENT_OS == "Mac": + import getpass + CURRENT_LOCAL_USER = getpass.getuser() else: - CURRENT_LOCAL_USER = os.environ['LOGNAME'] + import exceptions + class OSNotSupportedException(exceptions.StandardError): pass + raise OSNotSupportedException('Platform %s is not supported' % platform.system()) X2GO_SESSION_ROOTDIR = '.x2go' X2GO_CLIENT_ROOTDIR = '.x2goclient' 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).