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

Ensure SMART values are shown for some disks

Browse source 
* smartctl can return non-zero if there are errors in the SMART logs
This commit is contained in:
2Shirt 2019-04-08 18:57:38 -07:00
parent 14ebc23b81
commit 4d9ab2215b
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bin/Scripts/functions/hw_diags.py
View file

@ -350,7 +350,7 @@ class DiskObj():
def get_smart_details(self):
"""Get data from smartctl."""
cmd = ['sudo', 'smartctl', '--all', '--json', self.path]
self.smartctl = get_json_from_command(cmd)
self.smartctl = get_json_from_command(cmd, check=False)
# Check for attributes
if KEY_NVME in self.smartctl:

4
.bin/Scripts/functions/json.py
View file

@ -4,7 +4,7 @@ import json
from functions.common import *
def get_json_from_command(cmd, ignore_errors=True):
def get_json_from_command(cmd, check=True, ignore_errors=True):
"""Capture JSON content from cmd output, returns dict.
If the data can't be decoded then either an exception is raised
@ -17,7 +17,7 @@ def get_json_from_command(cmd, ignore_errors=True):
errors = 'ignore'
try:
result = run_program(cmd, encoding='utf-8', errors=errors)
result = run_program(cmd, check=check, encoding='utf-8', errors=errors)
json_data = json.loads(result.stdout)
except (subprocess.CalledProcessError, json.decoder.JSONDecodeError):
if not ignore_errors: