epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mod content installers.

Browse Source 
In 4312a4d3f4 MiniYaml merging was adjusted. One effect of this change was that duplicate keys in files that did not previously require merging was previously allowed, but was now an error. (Test case `TestMergeConflictsNoMerge`)

The installer files were relying on the previous behaviour to allow multiple `ContentPackage` keys. The above change caused a regression where attempting to manage mod content would crash due to now erroring on the duplicate keys.

We fix the issue by applying a unique ID suffix, as is a common pattern elsewhere in our yaml files, and teach InstallFromSourceLogic to recognise and strip it.
This commit is contained in:
RoosterDragon
2024-07-30 19:15:37 +01:00
committed by Gustas
parent ebaed9966b
commit 578a9fe457
22 changed files with 198 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mods/ra/installer/aftermath.yaml
View File

@@ -5,7 +5,7 @@ aftermath: Aftermath Expansion Disc (English)
SETUP/INSTALL/PATCH.RTP: 5bce93f834f9322ddaa7233242e5b6c7fea0bf17
Install:
# Aftermath expansion files:
ContentPackage:
ContentPackage@aftermathbase:
Name: aftermathbase
Actions:
ExtractRaw: SETUP/INSTALL/PATCH.RTP
@@ -18,9 +18,9 @@ aftermath: Aftermath Expansion Disc (English)
^SupportDir|Content/ra/v2/expand/lores1.mix:
Offset: 5273320
Length: 57076
ExtractMix: MAIN.MIX
ExtractMix@1: MAIN.MIX
^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
ExtractMix@2: ^SupportDir|Content/ra/v2/expand/sounds.mix
^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
@@ -47,12 +47,12 @@ aftermath: Aftermath Expansion Disc (English)
^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
# Aftermath music (optional):
ContentPackage:
ContentPackage@music-aftermath:
Name: music-aftermath
Actions:
ExtractMix: MAIN.MIX
ExtractMix@1: MAIN.MIX
^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
ExtractMix@2: ^SupportDir|Content/ra/v2/expand/scores.mix
^SupportDir|Content/ra/v2/expand/await.aud: await.aud
^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud