List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:November 24 2010 8:30pm
Subject:bzr commit into mysql-5.5-bugteam branch (vvaintroub:3140)
View as plain text  
#At file:///H:/bzr/mysql-5.5-bugteam/ based on revid:vvaintroub@stripped

 3140 Vladislav Vaintroub	2010-11-24
      MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if 
      feature states are modified (reported by Iggy)

    modified:
      packaging/WiX/mysql_server.wxs.in
=== modified file 'packaging/WiX/mysql_server.wxs.in'
--- a/packaging/WiX/mysql_server.wxs.in	2010-11-20 14:47:50 +0000
+++ b/packaging/WiX/mysql_server.wxs.in	2010-11-24 20:30:27 +0000
@@ -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&gt;4</Custom>
-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And UILevel&lt;=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&gt;4</Custom>
+      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
     </InstallExecuteSequence>
 
     <!-- Installation root-->


Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20101124203027-jlwxooeejhkwd3g1.bundle
Thread
bzr commit into mysql-5.5-bugteam branch (vvaintroub:3140) Vladislav Vaintroub24 Nov