[Python-checkins] gh-95445: Ensure Windows msi uninstalls document folder successfully (GH-95465)
miss-islington
webhook-mailer at python.org
Mon Aug 1 12:07:38 EDT 2022
https://github.com/python/cpython/commit/3192fd7683ad979d7f5ba996801da474c1606786
commit: 3192fd7683ad979d7f5ba996801da474c1606786
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-08-01T09:07:24-07:00
summary:
gh-95445: Ensure Windows msi uninstalls document folder successfully (GH-95465)
(cherry picked from commit 7d8973870bb079bf71d094cd966d6b6336f1e25f)
Co-authored-by: neonene <53406459+neonene at users.noreply.github.com>
files:
A Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst
M Tools/msi/doc/doc.wxs
diff --git a/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst b/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst
new file mode 100644
index 0000000000000..565489ebf909d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-30-14-18-33.gh-issue-95445.mjrTaq.rst
@@ -0,0 +1 @@
+Fixes the unsuccessful removal of the HTML document directory when uninstalling with Windows msi.
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
index e80fff43418bb..49798c752633f 100644
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -17,6 +17,11 @@
<RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#Doc_html_index.html]" KeyPath="yes" />
</RegistryKey>
</Component>
+
+ <Component Id="doc_folder" Directory="Doc" Guid="{22FD42DB-EC66-4B1C-B1FC-44E0CF7B2462}">
+ <CreateFolder />
+ <RemoveFolder Id="Remove_doc_folder" On="uninstall" />
+ </Component>
</Feature>
<Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="doc_html" />
More information about the Python-checkins
mailing list