Changeset 52986 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 8, 2014 10:51:30 AM (10 years ago)

Author:

vboxsync

Message:

MSI installer: fix MSM logic. Launch action ca_InstallNetFlt only during installation phase

File:

• trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi (modified) (4 diffs)

trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi

@@ -20 +20 @@
     <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" >
         <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
+            <![CDATA[NOT Installed]]>
         <?else ?>
             <![CDATA[&VBoxNetworkFlt=3]]>
@@ -27 +27 @@
     <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" >
         <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
+            <![CDATA[NOT Installed]]>
         <?else ?>
             <![CDATA[&VBoxNetworkFlt=3]]>
@@ -34 +34 @@
     <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" >
         <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
+            <![CDATA[NOT Installed]]>
         <?else ?>
             <![CDATA[&VBoxNetworkFlt=3]]>
@@ -41 +41 @@
     <Custom Action="ca_InstallNetFlt" Before="InstallFinalize" >
         <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <![CDATA[UPGRADINGPRODUCTCODE OR (NOT Installed)]]>
+            <![CDATA[NOT Installed]]>
         <?else ?>
             <![CDATA[&VBoxNetworkFlt=3]]>