[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-266-gf7f3638

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:52:36 CET 2014


The branch, build-baikal has been updated
       via  f7f363823f1bfafbe983ae01b7ca18979be25752 (commit)
      from  bd1a17fce75b861bb8d58e698f3a52619e80f80e (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:
 x2goserver/bin/x2goresume-session    |    4 ++--
 x2goserver/bin/x2gosuspend-session   |    2 +-
 x2goserver/bin/x2goterminate-session |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 49880e0..bc5b866 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -83,8 +83,8 @@ echo "$NEWOPTIONS" >${SESSION_DIR}/options
 
 $X2GO_LIB_PATH/x2goresume  $X2GO_CLIENT $SESSION_NAME  > /dev/null
 
-kill -HUP $X2GO_AGENT_PID &>/dev/null && \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || {
+kill -HUP $X2GO_AGENT_PID &>/dev/null && {
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME"
 } || {
        err_msg="ERROR: failed to resume session with ID $SESSION_NAME"
        echo err_$msg 1>&2
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index 139d0df..f336d03 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -40,7 +40,7 @@ killall -HUP knotify
 $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME  > /dev/null
 
 kill -HUP $X2GO_AGENT_PID &>/dev/null && {
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || {
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended"
 } || {
 	err_msg="ERROR: failed to suspend session with ID $SESSION_NAME"
 	echo err_$msg 1>&2
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 75bf277..a8bc92f 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -35,8 +35,8 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
 
 $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME  > /dev/null
 
-kill -TERM $X2GO_AGENT_PID &>/dev/null && \
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || {
+kill -TERM $X2GO_AGENT_PID &>/dev/null && {
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated"
 } || {
        err_msg="ERROR: failed to terminate session with ID $SESSION_NAME"
        echo "err_$msg" 1>&2


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