DocRock3r/custom-install
1
0
Fork 0
mirror of https://github.com/ihaveamac/custom-install.git synced 2025-12-06 06:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

custominstall: stop if cifinish.bin is corrupt

Browse Source
This commit is contained in:
Ian Burgwin
2021-02-08 23:43:13 -08:00
parent 7b121f5212
commit f904049c06
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
custominstall.py
View File

@@ -276,6 +276,16 @@ class CustomInstall:
else: else:
cifinish_path = join(self.sd, 'cifinish.bin') cifinish_path = join(self.sd, 'cifinish.bin')
try:
cifinish_data = load_cifinish(cifinish_path)
except InvalidCIFinishError as e:
self.log(f'{type(e).__qualname__}: {e}')
self.log(f'{cifinish_path} was corrupt!\n'
f'This could mean an issue with the SD card or the filesystem. Please check it for errors.\n'
f'It is also possible, though less likely, to be an issue with custom-install.\n'
f'Exiting now to prevent possible issues. If you want to try again, delete cifinish.bin from the SD card and re-run custom-install.')
return None, False
with TemporaryDirectory(suffix='-custom-install') as tempdir: with TemporaryDirectory(suffix='-custom-install') as tempdir:
# set up the common arguments for the two times we call save3ds_fuse # set up the common arguments for the two times we call save3ds_fuse
save3ds_fuse_common_args = [ save3ds_fuse_common_args = [
@@ -308,12 +318,6 @@ class CustomInstall:
return None, False return None, False
sd_path = join(sd_path, id1s[0]) sd_path = join(sd_path, id1s[0])
try:
cifinish_data = load_cifinish(cifinish_path)
except InvalidCIFinishError as e:
self.log(f'{cifinish_path} is invalid, not loading.')
self.log(f'{type(e).__qualname__}: {e}')
cifinish_data = {}
load_seeddb(self.seeddb) load_seeddb(self.seeddb)