[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-332-gaa55bf5
X2go dev team
git-admin at x2go.org
Tue Oct 4 13:47:00 CEST 2011
The branch, master has been updated
via aa55bf58742def751fa9d26a87963c5a312b5072 (commit)
from 470a297792d772dca9f6666ddf8693fdf05513c9 (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 aa55bf58742def751fa9d26a87963c5a312b5072
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Oct 4 13:46:57 2011 +0200
Fix for session dir cleanup, x2gologlevel returns int value, not string.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/bin/x2goruncommand | 3 ++-
x2goserver/bin/x2goterminate-session | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ce61352..3570f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,7 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low
mechanism of x2goserver.
* X2go server extensions have to completely quiet, diverting stdout/stderr to
/dev/null.
+ * Fix for session dir cleanup, x2gologlevel returns int value, not string.
[ Moritz Strübe ]
* Make digits at the beginning of X2go server extension scripts a must, not a
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 136b770..5c70502 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -146,6 +146,7 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null
export HOSTNAME
x2goumount-session $X2GO_SESSION
-if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ] && [ "x$successful_run" = "xtrue" ]; then
+# clean up session dir if not in debug mode and if session has been successful
+if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then
rm -Rf $HOME/.x2go/C-$X2GO_SESSION
fi
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 25be206..f66a9d9 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -63,6 +63,7 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
export HOSTNAME
x2goumount-session $SESSION_NAME
-if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "debug" ]; then
+# if we are not running in log level debug (=7) then clean up session dir
+if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then
rm -Rf $HOME/.x2go/C-$SESSION_NAME
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