patchsets: Expand PatchType class to support merging

Resolves hardcoded merge/overwrite assumptions in files.py’s install_new_file()
This commit is contained in:
Mykola Grymalyuk
2024-09-06 08:04:06 -06:00
parent 5a1fa12e5b
commit 7539d175b5
41 changed files with 137 additions and 110 deletions

View File

@@ -132,7 +132,7 @@ class PatcherValidation:
if install_type not in PatchType:
raise Exception(f"Unknown PatchType: {install_type}")
for install_type in [PatchType.INSTALL_SYSTEM_VOLUME, PatchType.INSTALL_DATA_VOLUME]:
for install_type in [PatchType.OVERWRITE_SYSTEM_VOLUME, PatchType.OVERWRITE_DATA_VOLUME, PatchType.MERGE_SYSTEM_VOLUME, PatchType.MERGE_DATA_VOLUME]:
if install_type in patchset[patch_core]:
for install_directory in patchset[patch_core][install_type]:
for install_file in patchset[patch_core][install_type][install_directory]: