From 7436b718fee31fd617ba20b9d4fc622a83005c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 9 Nov 2017 19:00:56 +0100 Subject: [PATCH] Set SSL_CERT_FILE and SSL_CERT_DIR only under frozen win32 This is the only case where ssl certificates are bundled. On other platform, it prevents to use the system certificates. issue6901 review36771002 --- bin/tryton | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/tryton b/bin/tryton index 1f84bd84cf..6f5868d11f 100755 --- a/bin/tryton +++ b/bin/tryton @@ -23,10 +23,11 @@ if hasattr(sys, 'frozen'): etc, 'gtk-2.0', 'gdk-pixbuf.loaders') os.environ['GTK_IM_MODULE_FILE'] = os.path.join( etc, 'gtk-2.0', 'gtk.immodules') - os.environ.setdefault('SSL_CERT_FILE', - os.path.join(etc, 'ssl', 'cert.pem')) - os.environ.setdefault('SSL_CERT_DIR', - os.path.join(etc, 'ssl', 'certs')) + if sys.platform == 'win32': + os.environ.setdefault('SSL_CERT_FILE', + os.path.join(etc, 'ssl', 'cert.pem')) + os.environ.setdefault('SSL_CERT_DIR', + os.path.join(etc, 'ssl', 'certs')) # On first launch the MacOSX app launcher may append an extra unique # argument starting with -psn_. This must be filtered to not crash the