From patchwork Thu Apr 23 14:28:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE] wix: remove cacert.pem from Windows distribution From: Yuya Nishihara X-Patchwork-Id: 8770 Message-Id: To: mercurial-devel@selenic.com Date: Thu, 23 Apr 2015 23:28:03 +0900 # HG changeset patch # User Yuya Nishihara # Date 1429796686 -32400 # Thu Apr 23 22:44:46 2015 +0900 # Branch stable # Node ID ffb4c8eadae45820f7dfb468cb43ed28fc4beacb # Parent 1f9127c9239b9c39c676bb09752db1e2ca6c26f7 wix: remove cacert.pem from Windows distribution It should not be included in the Windows installers because it prevents loading CA certificates from the system store on Python 2.7.9, implemented by 760a86865f80. The msi packages bundles Python 2.7.9, so cacert.pem is no longer necessary. Backed out changeset e5c2338d76b5 diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi --- a/contrib/wix/guids.wxi +++ b/contrib/wix/guids.wxi @@ -44,8 +44,6 @@ - - diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs --- a/contrib/wix/mercurial.wxs +++ b/contrib/wix/mercurial.wxs @@ -82,15 +82,6 @@ - - - - - - - @@ -132,8 +123,6 @@ - -