From 7cef24b902fc557f7b66d12207312bd39951dd0f Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Fri, 15 Oct 2010 15:40:08 -0400
Subject: [PATCH] Windows: Don't install over a newer or current installation

---
 packages/windows/installer/heimdal-installer.wxs | 5 +++++
 packages/windows/installer/lang/en-us.wxl        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index 05d157323..63cfca799 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -181,6 +181,9 @@
     <Upgrade Id='81E64C32-1D09-4E3D-9EA2-EECD9C4D16CE'>
       <UpgradeVersion IncludeMaximum='no' MigrateFeatures='yes' Maximum='$(var.Version)'
                       Property='PREVIOUSINSTALLATION' />
+      <UpgradeVersion Minimum='$(var.Version)' IncludeMinimum='yes'
+                      Maximum='127.127.32767.32767'
+                      OnlyDetect='yes' Property='EXISTINGINSTALLATION' />
     </Upgrade>
 
     <InstallExecuteSequence>
@@ -188,6 +191,8 @@
     </InstallExecuteSequence>
 
     <Condition Message='!(loc.AdminRequired)'>Installed OR Privileged</Condition>
+    <Condition Message='!(loc.AlreadyInstalled)'>Installed OR NOT EXISTINGINSTALLATION</Condition>
+
     <Feature Id='feature.Main' ConfigurableDirectory='INSTALLDIR'
              Title='!(loc.FeaMainTitle)'
              Description='!(loc.FeaMainDesc)'
diff --git a/packages/windows/installer/lang/en-us.wxl b/packages/windows/installer/lang/en-us.wxl
index 29fafe38d..be1b964cf 100644
--- a/packages/windows/installer/lang/en-us.wxl
+++ b/packages/windows/installer/lang/en-us.wxl
@@ -9,4 +9,5 @@
   <String Id='FeaMainTitle'>Heimdal</String>
   <String Id='FeaMainDesc'>Command line tools and libraries for Heimdal Kerberos</String>
   <String Id='AdminRequired'>Installation of this package requires elevation.</String>
+  <String Id='AlreadyInstalled'>A current or newer version of Heimdal is already installed on this machine.  Please use the Add/Remove Programs control panel to manage the existing installation.</String>
 </WixLocalization>