Skip to content

Commit 2020425

Browse files
committed
Allow the install process to fail and still continue and also recognize that as success in some cases
1 parent 3cdd7af commit 2020425

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

openandroidinstaller/tooling.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ def adb_twrp_wipe_and_install(
218218
sleep(1)
219219
if (type(line) == bool) and not line:
220220
yield False
221-
return
222221
break
223222
# finally reboot into os or to fastboot for flashing addons
224223
sleep(7)

openandroidinstaller/views/step_view.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ def display_progress_bar(self, line: str):
335335
result = None
336336
# get the progress numbers from the output lines
337337
if (type(line) == str) and line.strip():
338-
result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:)", line.strip())
338+
result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:|adb: failed to read command: Success)", line.strip())
339339
if result:
340340
if result.group(1):
341341
percentage_done = int(result.group(1))

0 commit comments

Comments
 (0)