diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-26 16:07:07 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-11-26 16:07:07 +0100 |
| commit | e3cbf205547e4b8e34438ab7413af409a6873731 (patch) | |
| tree | 559eb35fcb54ce58bde1038d5e44a71c64908a37 | |
| parent | 671da2e31eccad7df790e12cb46e51d4d71e9f9d (diff) | |
| download | mariadb-git-e3cbf205547e4b8e34438ab7413af409a6873731.tar.gz | |
Cherrypicked http://lists.mysql.com/commits/124935
MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if feature states are modified (reported by Iggy)
| -rw-r--r-- | packaging/WiX/mysql_server.wxs.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in index ea2ee1d9aaf..43a30538384 100644 --- a/packaging/WiX/mysql_server.wxs.in +++ b/packaging/WiX/mysql_server.wxs.in @@ -128,10 +128,10 @@ Impersonate="no"
Return="check" />
<InstallExecuteSequence>
- <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
- <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>
- <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And UILevel>4</Custom>
- <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And UILevel<=4</Custom>
+ <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+ <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+ <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4</Custom>
+ <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4</Custom>
</InstallExecuteSequence>
<!-- Installation root-->
|