x2goserver.git - master (branch) updated: 3.0.99.8-40-g3c0cb17 - x2go-commits

6 Jan 2012

The branch, master has been updated
       via  3c0cb17f554b7614016018222b56a445104e8355 (commit)
      from  9029807eca96120440e57e7a5cf0fc7cab0d3841 (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 3c0cb17f554b7614016018222b56a445104e8355
Author: Hayawardh V <hayawardh@gmail.com>
Date:   Fri Jan 6 19:54:04 2012 +0100

    Fix potentially empty LD_LIBRARY_PATH in x2gostartagent.

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

Summary of changes:
 debian/changelog              |    5 +++++
 x2goserver/bin/x2gostartagent |    9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 7bec0c5..d2a32d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * New upstream version (3.0.99.9):
     - Fix for install stanzas in several Makefiles.
     - Give X2Go session windows a human readable title.
@@ -15,6 +16,10 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
   * x2goserver package suggests x2goserver-pyhoca.
   * Fix directory permissions of $HOME directory of x2goprint system user.
 
+  [ Hayawardh V ]
+  * New upstream version (3.0.99.9):
+    - Fix potentially empty LD_LIBRARY_PATH in x2gostartagent.
+
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 25 Nov 2011 11:38:46 +0100
 
 x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 2715551..7dd6886 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -24,6 +24,13 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
+if [ ! ${LD_LIBRARY_PATH} ] || [ ! ${X2GO_LIB} ]; then
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${X2GO_LIB}"
+else
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${X2GO_LIB}"
+fi
+export LD_LIBRARY_PATH
+
 X2GO_PORT=49 #First port for X2GO=50
 SSH_PORT=30000 #First ssh port 30001
 
@@ -196,8 +203,6 @@ fi
 X2GO_COOKIE=`mcookie`
 
 
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${X2GO_LIB}"
-export LD_LIBRARY_PATH
 
 PATH="${PATH}:${X2GO_BIN}/"
 export PATH


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).

    