This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 941e464dd541b1cadbd5b61edd526283e4d79a86
Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
Date: Mon Apr 16 12:53:31 2018 +0200
sbin/x2gobroker-pubkeyauthorizer: Fix key lookup in os.environ for Python3.
---
sbin/x2gobroker-pubkeyauthorizer | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer
index ec8fd19..757880a 100755
--- a/sbin/x2gobroker-pubkeyauthorizer
+++ b/sbin/x2gobroker-pubkeyauthorizer
@@ -45,15 +45,15 @@ setproctitle.setproctitle("%s %s" % (PROG_NAME, "
".join(PROG_OPTIONS)))
### Normally, we would avoid that. However, this is to make this script
independent from
### the python-x2gobroker package (and its manifold python module
dependencies).
-if os.environ.has_key('X2GOBROKER_DAEMON_USER'):
+if 'X2GOBROKER_DAEMON_USER' in os.environ:
X2GOBROKER_DAEMON_USER=os.environ['X2GOBROKER_DAEMON_USER']
else:
X2GOBROKER_DAEMON_USER="x2gobroker"
-if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'):
+if 'X2GOBROKER_DAEMON_GROUP' in os.environ:
X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP']
else:
X2GOBROKER_DAEMON_GROUP="x2gobroker"
-if os.environ.has_key('X2GOBROKER_DEBUG'):
+if 'X2GOBROKER_DEBUG' in os.environ:
X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on',
'true', 'yes', ) )
else:
X2GOBROKER_DEBUG = False
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2gobroker.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
