x2goserver.git - master (branch) updated: 3.1.1.1-4-gffd7b50 - x2go-commits

26 Jun 2012

The branch, master has been updated
       via  ffd7b50051f441dd63ed724216c67ff657cbf99b (commit)
      from  85cbd8a06b78ed13d9ad2a3de47b4d854ae9e5d7 (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 ffd7b50051f441dd63ed724216c67ff657cbf99b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jun 26 10:29:35 2012 +0200

    Clean up session.log tmp directory if empty.

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

Summary of changes:
 debian/changelog              |    1 +
 x2goserver/bin/x2goruncommand |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 9593147..7f14ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low
       via NFSv4+Krb5 and not accessible by root. 
     - Use -fPIE gcc (position independed executable) for building
       x2gosqlitewrapper.c (as suggested by Jan Engelhardt).
+    - Clean up session.log tmp directory if empty.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 26 Jun 2012 09:32:31 +0200
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 4884e93..6e62709 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -246,5 +246,5 @@ test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout
 
 # 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
-	(sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; )&
+	(sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; rmdir --ignore-fail-on-non-empty "/tmp/.x2go-${USER}"; )&
 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).

    