[cpp-sp] 01/03: CPPSP-28 Windows Installers for Sp4 Agents

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/7e782b1d59be3af0a945f9e9cd109f785d4472eb

commit 7e782b1d59be3af0a945f9e9cd109f785d4472eb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 19 19:50:48 2026 +0000

    CPPSP-28 Windows Installers for Sp4 Agents
    
    https://shibboleth.atlassian.net/browse/CPPSP-28
    
    Ignore errors when uninstalling the IIS dlls.  We don't want a failure to
    stop installation.
---
 msi/wix6/sp4.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msi/wix6/sp4.wxs b/msi/wix6/sp4.wxs
index f537f1c6..4037e892 100644
--- a/msi/wix6/sp4.wxs
+++ b/msi/wix6/sp4.wxs
@@ -190,7 +190,7 @@
        <CustomAction Id="SetIISInstall" Property="QtIISInstall"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative /image:"[#IIS_lib]" /precondition:"bitness64""/>
 
-       <CustomAction Id="QtIISUnInstall" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+       <CustomAction Id="QtIISUnInstall" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
        <CustomAction Id="SetIISUnInstall" Property="QtIISUnInstall"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
 
@@ -199,7 +199,7 @@
        <CustomAction Id="SetIISInstall32" Property="QtIISInstall32"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" install module /name:ShibNative32 /image:"[#IIS_x86_lib]" /precondition:"bitness32"" />
 
-       <CustomAction Id="QtIISUnInstall32" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+       <CustomAction Id="QtIISUnInstall32" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" Return="ignore"/>
        <CustomAction Id="SetIISUnInstall32" Property="QtIISUnInstall32"
                      Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative32" />
        <?endif?>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.