[Python-checkins] cpython (3.4): Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid

[steve.dower]

https://hg.python.org/cpython/rev/6181476b5534
changeset:   99006:6181476b5534
branch:      3.4
parent:      99001:5fae49ef94fd
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Nov 07 10:07:04 2015 -0800
summary:
  Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.

files:
  Misc/NEWS        |  3 +++
  Tools/msi/msi.py |  6 ++++--
  2 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -708,6 +708,9 @@
 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
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -998,12 +998,14 @@
     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))

-- 
Repository URL: https://hg.python.org/cpython