[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-256-gccb2ff2

X2Go dev team git-admin at x2go.org
Sat Nov 30 22:21:18 CET 2013


The branch, master has been updated
       via  ccb2ff2464a2dde4253517ed697c92b1358260d5 (commit)
      from  d2d13a46c73c8f365e58562991f47d30538a8134 (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 ccb2ff2464a2dde4253517ed697c92b1358260d5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 30 22:19:56 2013 +0100

    Use mktemp instead of tempfile (because Fedora does not have the tempfile binary). (Fixes: #347).

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

Summary of changes:
 debian/changelog                 |    3 ++-
 x2goserver-xsession/etc/Xsession |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d036e1a..9cde8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -205,7 +205,8 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
 x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
 
-  * Continue development for LTS Baikal branch of X2Go Server...
+  * Use mktemp instead of tempfile (because Fedora does not have the tempfile
+    binary). (Fixes: #347).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Nov 2013 16:14:32 +0100
 
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 94c841e..47ec40e 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -74,7 +74,7 @@ ERRFILE=$HOME/.xsession-x2go-errors
 if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
   [ ! -L "$ERRFILE" ]; then
   chmod 600 "$ERRFILE"
-elif ERRFILE=$(tempfile 2> /dev/null); then
+elif ERRFILE=$(mktemp 2> /dev/null); then
   if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-x2go-$USER"; then
     message "warning: unable to symlink \"$TMPDIR/xsession-x2go-$USER\" to" \
              "\"$ERRFILE\"; look for session log/errors in" \
@@ -96,9 +96,9 @@ fi
 # Attempt to create a file of non-zero length in /tmp; a full filesystem can
 # cause mysterious X session failures.  We do not use touch, :, or test -w
 # because they won't actually create a file with contents.  We also let standard
-# error from tempfile and echo go to the error file to aid the user in
+# error from mktemp and echo go to the error file to aid the user in
 # determining what went wrong.
-WRITE_TEST=$(tempfile)
+WRITE_TEST=$(mktemp)
 if ! echo "*" >>"$WRITE_TEST"; then
   message "warning: unable to write to ${WRITE_TEST%/*}; X session (X2Go) may" \
           "exit with an error"


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