[X2Go-Commits] [x2goserver] 02/02: Don't fail Xsession startup if any of the profile scripts returns with an error.
git-admin at x2go.org
git-admin at x2go.org
Wed Jul 2 23:53:36 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 1905d59f966ca5e35a600dcf931ff9aa5b6fc3af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jul 2 23:50:41 2014 +0200
Don't fail Xsession startup if any of the profile scripts returns with an error.
---
debian/changelog | 2 ++
x2goserver-xsession/etc/Xsession | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 189338c..350f67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
- Detect the exit of rootless applications that forked to background on
application execution. (Fixes: #122).
- Make x2goruncommand more robust.
+ - Don't fail Xsession startup if any of the profile scripts returns
+ with an error.
* debian/control, x2goserver.spec:
+ Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go
works with poly-instantiated /tmp directories.
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index 2b4a14d..b9ef15e 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -53,7 +53,9 @@ internal_errormsg () {
for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
if [ -f "$file" ]; then
echo "Loading profile from $file";
+ set +e
. "$file"
+ set -e
fi
done
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list