Patchwork [STABLE] win32: remove cacert.pem file from Inno Setup installer

login
register
mail settings
Submitter Pascal Quantin
Date April 23, 2015, 7:33 p.m.
Message ID <ca1ad8ef38be225caec4.1429817608@PC>
Download mbox | patch
Permalink /patch/8771/
State Accepted
Headers show

Comments

Pascal Quantin - April 23, 2015, 7:33 p.m.
# HG changeset patch
# User Pascal Quantin <pascal.quantin@gmail.com>
# Date 1429816993 -7200
#      Thu Apr 23 21:23:13 2015 +0200
# Branch stable
# 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+.
Matt Mackall - April 23, 2015, 7:39 p.m.
On Thu, 2015-04-23 at 21:33 +0200, Pascal Quantin wrote:
> # HG changeset patch
> # User Pascal Quantin <pascal.quantin@gmail.com>
> # Date 1429816993 -7200
> #      Thu Apr 23 21:23:13 2015 +0200
> # Branch stable
> # Node ID ca1ad8ef38be225caec42564502aafe43cae173d
> # Parent  45bd336e3991b4e59ecb258a3bb8aa43d766a5f3
> win32: remove cacert.pem file from Inno Setup installer

Thanks, queued for default.

Patch

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\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