[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-311-g2ed8115
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:17:54 CET 2013
The branch, build-main has been updated
via 2ed8115be0a51a24cdfdb8fb5b691b9adbaabd95 (commit)
from 9969476427f8768934842700797355b3efe5dda7 (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 | 1 +
x2goserver/bin/x2goruncommand | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f1c36b4..072608d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,6 +93,7 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low
running in debug mode.
* Change of Desktop icons for shared folders. This change is needed for
parallel installation of x2gognomebindings and x2golxdebindings.
+ * Only remove server-side session directory if x2goruncommand has not failed.
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 345ad33..56f5446 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -109,6 +109,7 @@ then
IMEXIT="true"
fi
+if sucessful_run=false
if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC"
$cmd
@@ -119,6 +120,8 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
sleep 1
done
fi
+ # if we reach here the possibility of a successful command execution is rather high
+ successful_run=true
else
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute"
echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE
@@ -129,6 +132,6 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null
export HOSTNAME
x2goumount-session $X2GO_SESSION
-if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then
+if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ] && [ "x$successful_run" = "xtrue" ]; then
rm -Rf $HOME/.x2go/C-$X2GO_SESSION
fi
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