Remove SHIBSP_SCHEMAS on any type of 2.5 install

[shibboleth/sp.git] / msi / WiX / ShibbolethSP-noarch.wxs

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index b75a4c2..7343d13 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -148,6 +148,9 @@
           <Directory Id='var_cache_shibboleth' Name='shibboleth'>\r
             <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>\r
               <CreateFolder />\r
+              <!-- Kill off old env variable from pre 2.5 install.\r
+                   Do it here so it is in the correct tables -->\r
+              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>\r
             </Component>\r
           </Directory><!-- var_cache_shibboleth -->\r
         </Directory><!-- var_cache -->\r