[X2Go-Commits] [x2goserver] 07/08: x2goserver/bin/x2gostartagent: write hostname errors to stderr to make X2Go Client (and maybe PyHoca?) fail.

[git-admin at x2go.org]

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 0c103b87fdabb73468efe43c983537d8f836ed2b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Nov 1 09:43:21 2017 +0100

    x2goserver/bin/x2gostartagent: write hostname errors to stderr to make X2Go Client (and maybe PyHoca?) fail.
---
 debian/changelog              | 2 ++
 x2goserver/bin/x2gostartagent | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 533bd80..d1bbbf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
       x2goserver/bin/x2gostartagent.
     - x2goserver/bin/x2go{resume-session,startagent}: catch errors while
       inserting values into database more gracefully. Fixes: #1230.
+    - x2goserver/bin/x2gostartagent: write hostname errors to stderr to make
+      X2Go Client (and maybe PyHoca?) fail.
   * x2goserver.spec:
     - Add mandatory perl-generators Build-Requires as per
       https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index a6062b4..2275f6b 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -139,8 +139,10 @@ current_host_name="$(hostname -s)"
 
 if [[ "${?}" -ne "0" ]]; then
 	typeset msg="Unable to retrieve machine's hostname. This is required. Aborting session startup."
-	echo "${msg}"
 	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" "err" "${msg}"
+
+	# Make x2goclient fail.
+	echo "${msg}" >&2
 	exit 1
 fi
 

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git