changeset 24842:ca1ad8ef38be stable

win32: remove cacert.pem file from Inno Setup installer Duplicate the modification done in 6e38b6fc4123 for wix installer so that CA certificates loading works fine with Python 2.7.9+.
author Pascal Quantin <pascal.quantin@gmail.com>
date Thu, 23 Apr 2015 21:23:13 +0200
parents 45bd336e3991
children 21b33f0460e0
files contrib/win32/mercurial.iss
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/win32/mercurial.iss	Wed Apr 22 16:38:36 2015 -0700
+++ b/contrib/win32/mercurial.iss	Thu Apr 23 21:23:13 2015 +0200
@@ -80,7 +80,6 @@
 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\library.zip; DestDir: {app}
 Source: dist\add_path.exe; DestDir: {app}
-Source: dist\cacert.pem; Destdir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs
 Source: mercurial\help\*.txt; DestDir: {app}\help
@@ -93,7 +92,6 @@
 [INI]
 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/
 Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
-Filename: {app}\default.d\cacerts.rc; Section: web; Key: cacerts; String: {app}\cacert.pem
 
 [UninstallDelete]
 Type: files; Name: {app}\Mercurial.url