[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-327-g1e92e3c
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:17:56 CET 2013
The branch, build-main has been updated
via 1e92e3caaf6e134fec90cca2959787edeccb338a (commit)
from b232c13e3c724b0071e5d98ebc8aff645017c0d7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
.../bin/x2goserver-run-extensions | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 51bf9c8..5622a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,8 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low
* Adapt to renaming of x2godesktopsharing scripts.
* Provide man page for x2goserver-run-extensions that explains the new plug-in
mechanism of x2goserver.
+ * X2go server extensions have to completely quiet, diverting stdout/stderr to
+ /dev/null.
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index f938171..205e468 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -33,7 +33,7 @@ X2GO_MODALITY=$2
# scan extensions and execute them
ls $X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/* | sort | while read x2go_extension; do
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION"
- $x2go_extension $X2GO_SESSION && {
+ $x2go_extension $X2GO_SESSION &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully"
} || {
$X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..."
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