[gentoo-commits] gentoo-x86 commit in net-misc/x2goserver/files: x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch

[gentoo-commits] gentoo-x86 commit in net-misc/x2goserver/files: x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch

[Bernard Cafarelli (voyageur)]

voyageur    14/10/23 08:35:58

  Added:               
                        x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch
  Log:
  Prevent bash failures when sourcing external bash scripts, thanks Bernd Feige <Bernd.Feige@gmx.net> in bug #524350
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

Revision  Changes    Path
1.1                  net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch?rev=1.1&content-type=text/plain

Index: x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch
===================================================================
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.
-- 
1.7.9.5