[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.0.99-2-268-g3b08cc7

X2Go dev team git-admin at x2go.org
Thu Jun 6 13:34:53 CEST 2013


The branch, release/4.0.1.x 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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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).




More information about the x2go-commits mailing list