This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a6d338cf04bedd736b968fbbb568c399dcbd26ae Author: Tomáš Cerha <t.cerha@gmail.com> Date: Tue Jun 21 12:43:45 2022 +0200 Respect NXPROXY_BINARY also on non-Windows systems --- x2go/backends/proxy/nx3.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py index 03cb66b..5777d0e 100644 --- a/x2go/backends/proxy/nx3.py +++ b/x2go/backends/proxy/nx3.py @@ -66,6 +66,8 @@ class X2GoProxy(base.X2GoProxy): if os.path.exists(_nxproxy_cmd): break self.PROXY_CMD = _nxproxy_cmd + elif 'NXPROXY_BINARY' in os.environ: + self.PROXY_CMD = os.environ['NXPROXY_BINARY'] else: self.PROXY_CMD = "/usr/bin/nxproxy" self.PROXY_ENV.update({ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git