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

Avoid crash when parsing special mountpoints

Browse source
This commit is contained in:
2Shirt 2021-03-25 14:37:02 -06:00
parent 876ac668c1
commit 1f4a3c6e55
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/wk/os/linux.py
View file

@ -150,17 +150,23 @@ def mount_volumes(device_path=None, read_write=False, scan_corestorage=False):
result += 'Failed to mount' result += 'Failed to mount'
report.append(std.color_string(result, 'RED')) report.append(std.color_string(result, 'RED'))
continue continue
result += f'{"Mounted on "+vol.details.get("mountpoint", "?"):<40}'
# Add size to result # Add size to result
vol.get_details() vol.get_details()
vol.details['fsused'] = vol.details.get('fsused', -1) vol.details['fsused'] = vol.details.get('fsused', -1)
vol.details['fsavail'] = vol.details.get('fsavail', -1) vol.details['fsavail'] = vol.details.get('fsavail', -1)
result += f'{"Mounted on "+vol.details.get("mountpoint", "?"):<40}' if vol.details['fsused'] is None:
result = ( result = (
f'{result} ({vol.details.get("fstype", "Unknown FS")+",":<5} ' f'{result} ({vol.details.get("fstype", "Unknown FS")+",":<5})'
f'{std.bytes_to_string(vol.details["fsused"], decimals=1):>9} used, ' f'{std.bytes_to_string(vol.details["size"], decimals=1):>9})'
f'{std.bytes_to_string(vol.details["fsavail"], decimals=1):>9} free)' )
) else:
result = (
f'{result} ({vol.details.get("fstype", "Unknown FS")+",":<5} '
f'{std.bytes_to_string(vol.details["fsused"], decimals=1):>9} used, '
f'{std.bytes_to_string(vol.details["fsavail"], decimals=1):>9} free)'
)
report.append( report.append(
std.color_string( std.color_string(
result, result,