diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-12-02 16:28:51 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-12-02 16:28:51 (GMT) |
| commit | 10f997d98600aebe465ecd0175581634dd5b9d07 (patch) | |
| tree | 4e60ea752ee0cd10e0833f309f37e6e0fbaae5b8 /Tools/msi/bundle/packagegroups/launcher.wxs | |
| parent | 09a08de363cbe18a87392e1c2ebf0ac1f414592c (diff) | |
| download | cpython-10f997d98600aebe465ecd0175581634dd5b9d07.zip cpython-10f997d98600aebe465ecd0175581634dd5b9d07.tar.gz cpython-10f997d98600aebe465ecd0175581634dd5b9d07.tar.bz2 | |
Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect logic for launcher detection.
Diffstat (limited to 'Tools/msi/bundle/packagegroups/launcher.wxs')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/launcher.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/packagegroups/launcher.wxs b/Tools/msi/bundle/packagegroups/launcher.wxs index 4b03fd2..4444f45 100644 --- a/Tools/msi/bundle/packagegroups/launcher.wxs +++ b/Tools/msi/bundle/packagegroups/launcher.wxs @@ -11,7 +11,7 @@ EnableFeatureSelection="yes" Permanent="yes" Visible="yes" - InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher" /> + InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" /> <MsiPackage Id="launcher_JustForMe" SourceFile="launcher.msi" @@ -21,7 +21,7 @@ EnableFeatureSelection="yes" Permanent="yes" Visible="yes" - InstallCondition="not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher" /> + InstallCondition="not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" /> </PackageGroup> </Fragment> </Wix>
\ No newline at end of file |