]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.
authorSteve Dower <steve.dower@microsoft.com>
Sat, 7 Nov 2015 18:07:04 +0000 (10:07 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 7 Nov 2015 18:07:04 +0000 (10:07 -0800)
Misc/NEWS
Tools/msi/msi.py

index a0c1a6d2d0c7b22d4392adbf0a18003df09f7f1f..eee7d73727754a087b422c1c0e5e7374b468e7a3 100644 (file)
--- 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.
 
 
index d50056a9668448a299b99d3350685eb96e99fe54..d7453a5cbae060c615fba85813afcbb98f22fa15 100644 (file)
@@ -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))