sys_patch.py: Add typing check

This commit is contained in:
Mykola Grymalyuk
2024-08-28 16:22:16 -06:00
parent bd51332a17
commit b06feb9dbe
2 changed files with 10 additions and 4 deletions

View File

@@ -132,8 +132,11 @@ class PatcherValidation:
if install_type in patchset[patch_subject][patch_core]: if install_type in patchset[patch_subject][patch_core]:
for install_directory in patchset[patch_subject][patch_core][install_type]: for install_directory in patchset[patch_subject][patch_core][install_type]:
for install_file in patchset[patch_subject][patch_core][install_type][install_directory]: for install_file in patchset[patch_subject][patch_core][install_type][install_directory]:
try:
if patchset[patch_subject][patch_core][install_type][install_directory][install_file] in sys_patch_dict.DynamicPatchset: if patchset[patch_subject][patch_core][install_type][install_directory][install_file] in sys_patch_dict.DynamicPatchset:
continue continue
except TypeError:
pass
source_file = str(self.constants.payload_local_binaries_root_path) + "/" + patchset[patch_subject][patch_core][install_type][install_directory][install_file] + install_directory + "/" + install_file source_file = str(self.constants.payload_local_binaries_root_path) + "/" + patchset[patch_subject][patch_core][install_type][install_directory][install_file] + install_directory + "/" + install_file
if not Path(source_file).exists(): if not Path(source_file).exists():
logging.info(f"File not found: {source_file}") logging.info(f"File not found: {source_file}")

View File

@@ -495,8 +495,11 @@ class PatchSysVolume:
continue continue
for install_patch_directory in required_patches[patch][method_type]: for install_patch_directory in required_patches[patch][method_type]:
for install_file in required_patches[patch][method_type][install_patch_directory]: for install_file in required_patches[patch][method_type][install_patch_directory]:
try:
if required_patches[patch][method_type][install_patch_directory][install_file] in sys_patch_dict.DynamicPatchset: if required_patches[patch][method_type][install_patch_directory][install_file] in sys_patch_dict.DynamicPatchset:
required_patches[patch][method_type][install_patch_directory][install_file] = self._resolve_dynamic_patchset(required_patches[patch][method_type][install_patch_directory][install_file]) required_patches[patch][method_type][install_patch_directory][install_file] = self._resolve_dynamic_patchset(required_patches[patch][method_type][install_patch_directory][install_file])
except TypeError:
pass
source_file = required_patches[patch][method_type][install_patch_directory][install_file] + install_patch_directory + "/" + install_file source_file = required_patches[patch][method_type][install_patch_directory][install_file] + install_patch_directory + "/" + install_file