bzr commit into wex-installer-1.0 branch (iggy:221)

[Iggy Galarza]

#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped

  221 Iggy Galarza	2010-11-06
      Workaround for Server 5.5's MSI publisher/registry key value conflict.

    modified:
      WexInstaller/Core/Package.cs
=== modified file 'WexInstaller/Core/Package.cs'
--- a/WexInstaller/Core/Package.cs	2010-11-03 15:06:04 +0000
+++ b/WexInstaller/Core/Package.cs	2010-11-06 18:35:33 +0000
@@ -149,7 +149,18 @@ namespace WexInstaller.Core
                             // This fails when running on a 32 bit machine or OS version < Vista
                         }
                     }
-                    packageKey = packageKey.OpenSubKey(String.Format("{0}\\{1}", Publisher, DisplayName), false);
+
+                    RegistryKey publisherKey = packageKey.OpenSubKey(String.Format("{0}\\{1}", Publisher, DisplayName), false);
+                    if (publisherKey != null)
+                    {
+                        packageKey = publisherKey;
+                    }
+                    else
+                    {
+                        packageKey = packageKey.OpenSubKey(String.Format("{0}\\{1}", "MySQL AB", DisplayName), false);
+                        if (packageKey != null)
+                            Publisher = "MySQL AB";
+                    }
 
                     if (packageKey != null)
                     {


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