The branch, master has been updated via 6f8c10514fb270fe443d13e6c82db8295ba05429 (commit) from a5bf1ea2c008e16f28863c30b4ec92603033aed9 (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 ----------------------------------------------------------------- commit 6f8c10514fb270fe443d13e6c82db8295ba05429 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Apr 12 12:06:48 2012 +0200 Allow one PyHoca-GUI instance per user, not per system. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-gui | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 14bd388..871f88f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low --remember-username. - Implement X2Go-Top category in .desktop files that get used in the context of published applications. + - Allow one PyHoca-GUI instance per user, not per system. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index 0e446a5..c261eb5 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -135,7 +135,7 @@ VERSION: %s def check_running(): if _X2GOCLIENT_OS in ('Linux', 'Mac'): - p = subprocess.Popen(['ps', '-A'], stdout=subprocess.PIPE) + p = subprocess.Popen(['ps', '-U', _CURRENT_LOCAL_USER, '-u', _CURRENT_LOCAL_USER], stdout=subprocess.PIPE) psA_out = p.communicate() return psA_out[0].count(PROG_NAME) > 1 elif _X2GOCLIENT_OS == 'Windows': 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)).