The branch, master has been updated via 3b08cc72667148d6d0ba3bc77f8ac05b8b6c8968 (commit) from cd9b6a2aa8d46b268a334ebfafcecf55d4f98137 (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 3b08cc72667148d6d0ba3bc77f8ac05b8b6c8968 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 16 23:38:15 2011 +0200 Silence knotify SIGHUP signals in case that no knotify is running in the X2go session. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gosuspend-session | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2a107b7..483245d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * SQLite DB backend: Fix typo in date format template. * Present an ISO-8601 compliant datetime string in session lists rendered by x2golistsessions (and similar) command(s). + * Silence knotify SIGHUP signals in case that no knotify is running in the + X2go session. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 542ec35..b839988 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -33,9 +33,8 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` - -#workaround for knotify -killall -HUP knotify +# workaround for knotify, keep silent in case no knotify is running +killall -HUP knotify &>/dev/null $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).