From 8dcec0dfa8ae37418f6a8d4ccf74125359c18e50 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 16 May 2023 08:32:41 -0600 Subject: [PATCH] validation.py: Clean up after root patch validation --- resources/validation.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resources/validation.py b/resources/validation.py index c34cfa142..8ef0b6aca 100644 --- a/resources/validation.py +++ b/resources/validation.py @@ -166,6 +166,29 @@ class PatcherValidation: self.constants.computer.reported_board_id = "Mac-7BA5B2DFE22DDD8C" sys_patch_helpers.SysPatchHelpers(self.constants).snb_board_id_patch(self.constants.payload_local_binaries_root_path) + # unmount the dmg + output = subprocess.run( + [ + "hdiutil", "detach", Path(self.constants.payload_path / Path("Universal-Binaries")), + "-force" + ], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + + if output.returncode != 0: + logging.info("- Failed to unmount Universal-Binaries.dmg") + logging.info(f"Output: {output.stdout.decode()}") + logging.info(f"Return Code: {output.returncode}") + + raise Exception("Failed to unmount Universal-Binaries.dmg") + + subprocess.run( + [ + "rm", "-f", Path(self.constants.payload_path / Path("Universal-Binaries_overlay")) + ], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + def _validate_configs(self) -> None: """