bzr commit into wex-installer-1.0 branch (reggie.burnett:281)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  281 Reggie Burnett	2011-02-01
      fixing products installed bug

    modified:
      Setup_Net/Product.wxs
      WexInstaller/Core/ProductManager.cs
=== modified file 'Setup_Net/Product.wxs'
=== modified file 'Setup_Net/Product.wxs'
--- a/Setup_Net/Product.wxs	2011-01-31 21:36:45 +0000
+++ b/Setup_Net/Product.wxs	2011-02-01 21:05:32 +0000
@@ -77,8 +77,8 @@
                 <File Id="workbench" Name="mysql-workbench-gpl-5.2.29-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.29-win32.msi"/>
                 -->
                 <File Id="connector_odbc" Name="mysql-connector-odbc-5.1.6-win32.msi" Source="ProductCache\mysql-connector-odbc-5.1.6-win32.msi"/>
-                <!--<File Id="connector_cpp" Name="mysql-connector-c++-1.0.5-win32.msi" Source="ProductCache\mysql-connector-c++-1.0.5-win32.msi"/>
-                <File Id="connector_c" Name="mysql-connector-c-6.0.2-win32.msi" Source="ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
+                <File Id="connector_cpp" Name="mysql-connector-c++-1.0.5-win32.msi" Source="ProductCache\mysql-connector-c++-1.0.5-win32.msi"/>
+                <!--<File Id="connector_c" Name="mysql-connector-c-6.0.2-win32.msi" Source="ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
                 <File Id="universion_docs" Name="mysql-universal-installer-document-bundle-1.0.0.0.msi" Source="ProductCache\mysql-universal-installer-document-bundle-1.0.0.0.msi"/>
                 -->
               </Component>

=== modified file 'WexInstaller/Core/ProductManager.cs'
--- a/WexInstaller/Core/ProductManager.cs	2011-02-01 18:46:41 +0000
+++ b/WexInstaller/Core/ProductManager.cs	2011-02-01 21:05:32 +0000
@@ -74,6 +74,16 @@
                 }
             }
 
+            // run through all categories and determine if *any* products are
+            // installed or have upgrades
+            foreach (ProductCategory category in manifest.ProductCategories)
+                foreach (Product product in category.Products)
+                {
+                    ProductsInstalled |= product.Installed;
+                    ProductsUpgrade |= product.IsUpgrade;
+                }
+
+            // run through all catalogs and de-reference all referenced products
             foreach (ProductCatalog catalog in manifest.ProductCatalogs)
                 foreach (CatalogProduct p in catalog.Products)
                 {
@@ -81,8 +91,6 @@
                     if (p.ReferencedProduct == null)
                         //TODO: handle this better
                         throw new InvalidOperationException();
-                    ProductsInstalled = p.ReferencedProduct.Installed;
-                    ProductsUpgrade = p.ReferencedProduct.IsUpgrade;
                 }
 
             // Default to first catalog and then see if we have a catalog file


Attachment: [text/bzr-bundle] bzr/[e-mail]