2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fixed HDD checkbox logic

Browse source
This commit is contained in:
2Shirt 2020-01-17 16:14:29 -07:00
parent fa96f6ea13
commit 5fbd33e845
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/wk/hw/ddrescue.py
View file

@ -1683,6 +1683,7 @@ def get_working_dir(
def main():
# pylint: disable=too-many-branches
"""Main function for ddrescue TUI."""
args = docopt(DOCSTRING)
log.update_log_path(dest_name='ddrescue-TUI', timestamp=True)

33
scripts/wk/hw/diags.py
View file

@ -1400,23 +1400,24 @@ def ost_update_checkboxes(state):
elif state.cpu.all_tests_passed():
state.ost.set_flag_passed('CPU')
# Disk pass/fail (only if all disk tests were selected)
if all(disk_tests_enabled) and len(disk_tests_enabled) == NUM_DISK_TESTS:
all_disks_passed = True
# Check results for all disks
all_disks_passed = True
for disk in state.disks:
if disk.any_test_failed():
# Mark failed disk in osTicket and stop checking results
all_disks_passed = False
state.ost.set_flag_failed('Disk')
break
if not disk.all_tests_passed():
all_disks_passed = False
break
# Check results for all disks
for disk in state.disks:
if disk.any_test_failed():
all_disks_passed = False
state.ost.set_flag_failed('Disk')
break
if not disk.all_tests_passed():
all_disks_passed = False
break
# All disks passed
if all_disks_passed:
state.ost.set_flag_passed('Disk')
# All disks passed
if (all_disks_passed
and all(disk_tests_enabled)
and len(disk_tests_enabled) == NUM_DISK_TESTS):
# Only mark as passed if a full disk diagnostic passed
state.ost.set_flag_passed('Disk')
def print_countdown(proc, seconds):