[X2Go-Commits] [x2goserver] 07/15: x2goserver/bin/x2goresume-session: fix err_msg => msg usage.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 0d054632f48f11ab3affc55328382c622b8e9057
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 6 22:08:23 2021 +0100

    x2goserver/bin/x2goresume-session: fix err_msg => msg usage.
---
 debian/changelog                  | 1 +
 x2goserver/bin/x2goresume-session | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2553f12b..1d3f9c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -393,6 +393,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver/bin/x2goresume-session: update copyright notice.
     - x2goserver/bin/x2goresume-session: use printf more often instead of the
       not-so-portable echo builtin.
+    - x2goserver/bin/x2goresume-session: fix err_msg => msg usage.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 2432c72c..b6c6bc8a 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -369,9 +369,9 @@ if kill -HUP "${x2go_agent_pid}" &>'/dev/null'; then
 	x2gofeature 'X2GO_RUN_EXTENSIONS' &>'/dev/null' && x2goserver-run-extensions "${session_name}" 'post-resume' || true
 	grep 'PPid' "/proc/${PPID}/status" >"${x2go_root}/C-${session_name}/sshd.pid"
 else
-	err_msg="ERROR: failed to resume session with ID ${session_name}"
-	echo "${err_msg}" 1>&2
-	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${err_msg}"
+	msg="ERROR: failed to resume session with ID ${session_name}"
+	echo "${msg}" 1>&2
+	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 
 	# If we reach here it means that the x2goagent process of the session has vanished
 	# If this happens than we mark the session as finished...

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git