[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-333-gf68c158
X2go dev team
git-admin at x2go.org
Wed Oct 5 14:28:06 CEST 2011
The branch, master has been updated
via f68c15882dfbe0d4dd2fc7ab88f007c4b3bb1d41 (commit)
from aa55bf58742def751fa9d26a87963c5a312b5072 (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 f68c15882dfbe0d4dd2fc7ab88f007c4b3bb1d41
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date: Wed Oct 5 14:27:24 2011 +0200
remove session directory after 10 sec delay to let x2goclient check cmdoutput file
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 7 +++++--
x2goserver/bin/x2goruncommand | 2 +-
x2goserver/bin/x2goterminate-session | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3570f7a..05f065e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low
+x2goserver (3.0.99.6-0~x2go1.1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Rename x2goumount_session calls to x2goumount-session calls in x2goserver
@@ -122,7 +122,10 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low
[ Martin Oehler ]
* Removes old debug code fragment, fixes x2golistsessions parsing.
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 05 Jun 2011 20:44:32 +0200
+ [ Oleksandr Shneyder ]
+ * remove session directory after 10 sec delay to let x2goclient check cmdoutput file
+
+ -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de> Wed, 05 Oct 2011 14:25:12 +0200
x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 5c70502..c9ab020 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -148,5 +148,5 @@ x2goumount-session $X2GO_SESSION
# 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
+ (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)&
fi
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index f66a9d9..cb1210a 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -65,5 +65,5 @@ x2goumount-session $SESSION_NAME
# 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
+ (sleep 10; 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