[X2Go-Commits] [x2gobroker] 12/17: Convert one more unicode object into (Python3) string.

[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 x2gobroker.

commit cb7e297b5c34926c1f30afdccee82ec22cf03e70
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 30 10:26:25 2018 +0100

    Convert one more unicode object into (Python3) string.
---
 debian/changelog       | 1 +
 sbin/x2gobroker-keygen | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 57f3f69..dde5278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
     - bin/x2gobroker: Correctly use split_host_address() function call.
     - bin/x2gobroker: Don't override already defined logger objects, define
       them properly where needed.
+    - Convert one more unicode object into (Python3) string.
   * debian/*:
     + Trigger Makefile's install target and install those files. Drop debhelper
       from-source-installation magic.
diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen
index 95a5b40..5fe716b 100755
--- a/sbin/x2gobroker-keygen
+++ b/sbin/x2gobroker-keygen
@@ -95,7 +95,7 @@ if __name__ == '__main__':
     cmdline_args = p.parse_args()
 
     if cmdline_args.key_type.upper() not in supported_key_types:
-        logger_error.error(u'Unknown key type »{key_type}«. Possible key types are RSA and DSA. Exiting...'.format(key_type=cmdline_args.key_type.upper()))
+        logger_error.error('Unknown key type »{key_type}«. Possible key types are RSA and DSA. Exiting...'.format(key_type=cmdline_args.key_type.upper()))
         sys.exit(-2)
 
     broker_uid = x2gobroker.defaults.X2GOBROKER_DAEMON_USER

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