[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-6-g91c4bb8

[X2Go dev team]

The branch, master has been updated
       via  91c4bb8568bb649fcef89484b19a556453b57e04 (commit)
      from  90878489a1334d9d840556e0b2e69a47425c1658 (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 91c4bb8568bb649fcef89484b19a556453b57e04
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 19 20:34:09 2012 +0200

    Avoid error messages in x2gocmdexistmessage if cmdoutput file could not be found.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2goserver/bin/x2gocmdexitmessage |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 72ad6f8..82df7fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
     - Handle whitespace in folder names appropriately.
     - Allow .desktop file parameter Terminal=... to pass through to X2Go
       client-side.
+    - Avoid error messages in x2gocmdexistmessage if cmdoutput file could
+      not be found.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index e8002ee..a17bb9f 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -25,7 +25,10 @@ X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
 
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed s/\n/ /g)"
 
-# return command output of the command that was issued by x2goruncommand
-cat "$MESSAGE_FILE"
+test -f "$MESSAGE_FILE" && {
+       $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed 's/\n/ /g')"
+
+       # return command output of the command that was issued by x2goruncommand
+       cat "$MESSAGE_FILE"
+}


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