From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 7 Nov 2015 18:07:04 +0000 (-0800)
Subject: Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.
X-Git-Tag: v3.5.1rc1~81^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba270147e4f9330cc9275bd0164f239374e3ad41;p=thirdparty%2FPython%2Fcpython.git

Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index a0c1a6d2d0c7..eee7d7372775 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -708,6 +708,9 @@ Tools/Demos
 Windows
 -------
 
+- Issue #24306: Sets component ID for launcher to match 3.5 and later
+  to avoid downgrading.
+
 - Issue #25022: Removed very outdated PC/example_nt/ directory.
 
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d50056a96684..d7453a5cbae0 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -998,12 +998,14 @@ def add_files(db):
     if launchersrc.lower() == 'pcbuild\\amd64':
         launchersrc = 'PCBuild'
     launcher = os.path.join(srcdir, launchersrc, "py.exe")
-    launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
+    launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe",
+                                uuid="{B5107402-6958-461B-8B0A-4037D3327160}")
     launcherdir.add_file(launcher,
                          version=installer.FileVersion(launcher, 0),
                          language=installer.FileVersion(launcher, 1))
     launcherw = os.path.join(srcdir, launchersrc, "pyw.exe")
-    launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe")
+    launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe",
+                                uuid="{8E52B8CD-48BB-4D74-84CD-6238BCD11F20}")
     launcherdir.add_file(launcherw,
                          version=installer.FileVersion(launcherw, 0),
                          language=installer.FileVersion(launcherw, 1))