The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 3b4c55e04cad2523ab3253df4fd79de5fd4a83a9 (commit)
from 6ae951b5a06e840e740b548cbb97347fe42f148b (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, 5 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index ec3786e..7ea8193 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -35,7 +35,6 @@ import argparse
import os
import os.path
import sys
-import platform
import exceptions
# Python X2go modules
@@ -114,13 +113,13 @@ def parseargs():
version()
if a.username is None:
- if platform.system() == 'Windows':
+ if x2go.X2GOCLIENT_OS == 'Windows':
import win32api
a.username = win32api.GetUserName()
- elif platform.system() == 'Linux':
+ elif x2go.X2GOCLIENT_OS == 'Linux':
import getpass
a.username = getpass.getuser()
- elif platform.system() == 'Mac':
+ elif x2go.X2GOCLIENT_OS == 'Mac':
import getpass
a.username = getpass.getuser()
else:
@@ -135,12 +134,12 @@ def version():
sys.exit(0)
def check_running(logger):
- if platform.system() in ('Linux', 'Mac'):
+ if x2go.X2GOCLIENT_OS in ('Linux', 'Mac'):
p = subprocess.Popen(['ps', '-A'], stdout=subprocess.PIPE)
psA_out = p.communicate()
#logger('psa_out %s' % (psA_out,), x2go.loglevel_DEBUG )
return psA_out[0].count(PROG_NAME) > 1
- elif platform.system() == 'Windows':
+ elif x2go.X2GOCLIENT_OS == 'Windows':
# TODO!!!
return False
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)).