Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
2Shirt 2021-03-25 15:20:55 -06:00
commit 467a7e7925
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -158,7 +158,7 @@ def mount_volumes(device_path=None, read_write=False, scan_corestorage=False):
vol.details['fsavail'] = vol.details.get('fsavail', -1) vol.details['fsavail'] = vol.details.get('fsavail', -1)
if vol.details['fsused'] is None: 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["size"], decimals=1):>9})' f'{std.bytes_to_string(vol.details["size"], decimals=1):>9})'
) )
else: else: