bzr commit into wex-installer-1.0 branch (mike.lischke:437)

[Mike Lischke]

#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped

  437 Mike Lischke	2011-04-18
      ProductManager: base the decision about a new setup not on the active catalog (but any installed product) otherwise we end up with ignoring products not in that catalog.

    modified:
      WexInstaller.Core/ProductManager.cs
=== modified file 'WexInstaller.Core/ProductManager.cs'
=== modified file 'WexInstaller.Core/ProductManager.cs'
--- a/WexInstaller.Core/ProductManager.cs	2011-04-07 14:04:55 +0000
+++ b/WexInstaller.Core/ProductManager.cs	2011-04-18 09:39:43 +0000
@@ -222,22 +222,7 @@
 
     public static bool IsNewSetup()
     {
-      if (ActiveCatalog == null)
-      {
-        if (ProductsInstalled)
-          return false;
-        if (ProductsUpgrade)
-          return false;
-        return true;
-      }
-      else
-      {
-        if (CatalogProductsInstalled)
-          return false;
-        if (CatalogProductsUpgrade)
-          return false;
-        return true;
-      }
+      return !(ProductsInstalled || ProductsUpgrade);
     }
 
     private static void LoadManifestWithCheckForTemp()


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