This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 00426c8 Be a bit more tolerant when trying to detect if a desktop icon is to be removed (using regexp, not eq). new 2d602ff Prevent bash failures when sourcing external bash scripts beyond our scope. (Fixes: #632). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++++ 2 files changed, 6 insertions(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2d602ffb909670f659b18204dddb91e14fce52cc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 8 05:26:30 2014 +0200 Prevent bash failures when sourcing external bash scripts beyond our scope. (Fixes: #632). --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 73d5838..83bf1db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -135,6 +135,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - Be a bit more tolerant when trying to detect if a desktop icon is to be removed (using regexp, not eq). + - Xsession script: Prevent bash failures when sourcing external bash + scripts beyond our scope. (Fixes: #632). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index b9ef15e..94692db 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then # Set up i18n environment if [ -r /etc/profile.d/lang.sh ]; then + set +e . /etc/profile.d/lang.sh + set -e fi # merge in defaults @@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then # run all system xinitrc shell scripts. for file in /etc/x2go/xinitrc.d/* ; do + set +e [ -r "$file" ] && . $file + set -e done # Prefix launch of session with ssh-agent if available and not already running. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org