This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 183f8707822e7c64378526f81fa1c2892bfe02a4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 18 10:43:06 2019 +0100 Make builds reproducible. Thanks to Chris Lamb for providing a patch. (See Debian bug #922137). --- x2gobroker/brokers/base_broker.py | 3 +++ x2gobroker/defaults.py | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 6f959eb..5b4303e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -82,6 +82,7 @@ class X2GoBroker(object): self._dynamic_cookie_map = {} self._client_address = None + self._cookie = None def __del__(self): """\ @@ -199,6 +200,8 @@ class X2GoBroker(object): my_cookie = unconfigured_my_cookie deprecated_my_cookie = self.config.get_value('global', 'my-cookie') + if deprecated_my_cookie is None: + deprecated_my_cookie = uuid.uuid4() my_cookie_file = self.config.get_value('global', 'my-cookie-file') if os.path.isfile(my_cookie_file): diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 55d8538..e10ccb0 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -32,7 +32,6 @@ X2Go Session Brokers uses many hard-coded defaults, that can be overridden in va # modules import os -import uuid import socket import pwd, grp @@ -230,7 +229,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'pre_auth_scripts': [], 'post_auth_scripts': [], 'select_session_scripts': [], - 'my-cookie': uuid.uuid4(), + 'my-cookie': None, 'my-cookie-file': '/etc/x2go/broker/x2gobroker.authid', 'enable-plain-output': True, 'enable-json-output': True, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git