erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-04 16:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #29211 from l0rd/win-installer-rm-is_upgrade

Browse source 
Windows installer: remove unused IS_UPGRADE property
This commit is contained in:
Mario Loriedo 2026-07-22 09:41:23 +02:00 • committed by GitHub
commit 988860edb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/win-installer/wix/podman-main.wxs
View file

@ -66,14 +66,14 @@ and other data will be preserved." />
Action="SetCONFDIR_User"
Value="[AppDataFolder]containers\containers.conf.d"
Before="AppSearch"
Condition="MSIINSTALLPERUSER=1 AND NOT IS_UPGRADE"
Condition="MSIINSTALLPERUSER=1"
Sequence="first" />
<SetProperty Id="CONFDIR"
Action="SetCONFDIR_Machine"
Value="[CommonAppDataFolder]containers\containers.conf.d"
Before="AppSearch"
Condition="ALLUSERS=1 AND NOT MSIINSTALLPERUSER=1 AND NOT IS_UPGRADE"
Condition="ALLUSERS=1 AND NOT MSIINSTALLPERUSER=1"
Sequence="first" />
<!--
@ -81,6 +81,7 @@ and other data will be preserved." />
The machine provider config file is created (or is not deleted if it already exist) if these conditions are met:
- The user hasn't set property `SKIP_CONFIG_FILE_CREATION` to 1
- The main executable file (<PFILESDIR>/Podman/podman.exe) doesn't exist or, if it exists, the machine provider config file exists
Note: if the podman.exe exists AND the config file exists we must set to 1 or the installer deletes the existing config file ¯\_(ツ)_/¯
-->
<SetProperty Id="CREATE_MACHINE_PROVIDER_CONFIG_FILE"
After="AppSearch"