# HG changeset patch # User Pascal Quantin # Date 2015-04-23 19:23:13 # Node ID ca1ad8ef38be225caec42564502aafe43cae173d # Parent 45bd336e3991b4e59ecb258a3bb8aa43d766a5f3 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+. diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss +++ b/contrib/win32/mercurial.iss @@ -80,7 +80,6 @@ Source: dist\w9xpopen.exe; DestDir: {app 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 @@ Source: COPYING; DestDir: {app}; DestNam [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