[X2Go-Commits] [pyhoca-gui] 01/01: Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
git-admin at x2go.org
git-admin at x2go.org
Tue Apr 15 08:00:13 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pyhoca-gui.
commit e6c72305c40e9251ccd61bb4b8aecab6c75bb84b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Apr 15 07:55:19 2014 +0200
Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
---
debian/changelog | 1 +
pyhoca/wxgui/launcher.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 82486c6..0b8edaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low
been successful.
- Properly set focus in broker logon window (default: password, if no username
provided: username, if no URL provided: broker-URL field).
+ - Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
- Update English / German translation.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100
diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py
index c3b9761..57d8ffd 100644
--- a/pyhoca/wxgui/launcher.py
+++ b/pyhoca/wxgui/launcher.py
@@ -115,9 +115,9 @@ VERSION: %s
basepath.reload_base_paths()
def check_running(self):
- if X2GOCLIENT_OS in ('Linux', 'Mac'):
+ _executable = os.path.basename(sys.argv[0]).replace('.exe', '')
- _executable = os.path.basename(sys.argv[0]).replace('.exe', '')
+ if X2GOCLIENT_OS in ('Linux', 'Mac'):
p = subprocess.Popen(['ps', '-U', CURRENT_LOCAL_USER, '-u', CURRENT_LOCAL_USER], stdout=subprocess.PIPE)
psA_out = p.communicate()
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
More information about the x2go-commits
mailing list