The branch, twofactorauth has been updated via 41e42a29f5605d3759ba586f7cdf49ab910e5ff4 (commit) from 7f1f21bd59f573e18abab9b6edf7f078cc0bcfd3 (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: pyhoca-gui | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca-gui b/pyhoca-gui index 528121a..fd58285 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -82,11 +82,11 @@ def check_running(): p = subprocess.Popen(['ps', '-A'], stdout=subprocess.PIPE) psA_out = p.communicate() return psA_out[0].count(PROG_NAME) > 1 - elif X2GOCLIENT_OS == 'Windows': + elif _X2GOCLIENT_OS == 'Windows': import wmi w = wmi.WMI() _p_names = [] - for process in _wmi.Win32_Process(): + for process in w.Win32_Process(): _p_names.append(process.Name) return len([ _p_name for _p_name in _p_names if _p_name == PROG_NAME]) > 1 @@ -144,6 +144,7 @@ x2go_gui_options = [ {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended session on connect', }, {'args':['--disable-options'], 'default': False, 'action': 'store_true', 'help': 'disable the client options configuration window', }, {'args':['--disable-profilemanager'], 'default': False, 'action': 'store_true', 'help': 'disable the session profile manager window', }, + {'args':['--display'], 'default': None, 'metavar': '<hostname>:<screennumber>', 'help': 'set the DISPLAY environment variable to <hostname>:<screennumber>', }, ] if _X2GOCLIENT_OS == 'Windows': xserver_options = [ @@ -201,6 +202,12 @@ def parseargs(): runtime_error('Xserver ,,%s\'\' is not installed on your Windows system' % a.preferred_xserver, parser=p) a.start_xserver = a.preferred_xserver + if _X2GOCLIENT_OS == 'Windows' and a.start_xserver and a.display: + runtime_error('You can tell PyHoca-GUI to handle XServer startup and then specify a DISPLAY environment variable!', parser=p) + + if a.display: + os.environ.update({'DISPLAY': a.display}) + return a, logger, liblogger def main(): hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).