From bb2b2526235a0eb9ace290c266368d702c883685 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 7 Mar 2020 00:30:14 +0100 Subject: [PATCH] strip header if it exists, for patching --- Patch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Patch.py b/Patch.py index 2c8adae3..fec037e4 100644 --- a/Patch.py +++ b/Patch.py @@ -6,7 +6,7 @@ import hashlib import logging import Utils -from Rom import JAP10HASH +from Rom import JAP10HASH, read_rom base_rom_bytes = None @@ -17,13 +17,13 @@ def get_base_rom_bytes() -> bytes: with open("host.yaml") as f: options = Utils.parse_yaml(f.read()) file_name = options["general_options"]["rom_file"] - base_rom_bytes = load_bytes(file_name) + base_rom_bytes = bytes(read_rom(open(file_name, "rb"))) basemd5 = hashlib.md5() basemd5.update(base_rom_bytes) if JAP10HASH != basemd5.hexdigest(): - logging.getLogger('').warning('Supplied Base Rom does not match known MD5 for JAP(1.0) release.' - ' Will try to patch anyway.') + logging.warning('Supplied Base Rom does not match known MD5 for JAP(1.0) release.' + ' Will try to patch anyway.') return base_rom_bytes