Changeset 66379 in vbox

Timestamp:

Mar 31, 2017 11:22:40 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114325

Message:

Installer/win: Previous change broke package upgrade, so refine the condition further. Actual driver uninstall shouldn't be done on upgrade, as it would lose the information which host-only interfaces are created.

Location:

trunk/src/VBox/Installer/win

Files:

• VBoxMergeNetAdp6Seq.wxi (modified) (1 diff)
• VBoxMergeNetAdpSeq.wxi (modified) (1 diff)

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

@@ -42 +42 @@
     </Custom>
 
+    <!-- Finally uninstall the driver, but only on package uninstall -->
     <Custom Action="ca_UninstallNetAdp6Args" Before="ca_UninstallNetAdp6" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
     <Custom Action="ca_UninstallNetAdp6" After="ca_StopHostOnlyInterfacesNDIS6" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
 

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

@@ -42 +42 @@
     </Custom>
 
+    <!-- Finally uninstall the driver, but only on package uninstall -->
     <Custom Action="ca_UninstallNetAdpArgs" Before="ca_UninstallNetAdp" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>
     <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <![CDATA[NOT (UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
     </Custom>