Switch to single-line disk descriptions

This commit is contained in:
2Shirt 2017-12-27 19:36:22 -07:00
parent 7092391c47
commit 698546f823

View file

@ -473,14 +473,13 @@ def show_disk_details(dev):
dev_name = dev['lsblk']['name'] dev_name = dev['lsblk']['name']
# Device description # Device description
print_info('Device: /dev/{}'.format(dev['lsblk']['name'])) print_info('Device: /dev/{}'.format(dev['lsblk']['name']))
for key in ['model', 'size', 'serial']: print_standard(' {:>4} ({}) {} {}'.format(
print_standard(' {:8}{}'.format(key, dev['lsblk'].get(key, 'Unknown'))) str(dev['lsblk'].get('size', '???b')).strip(),
if dev['lsblk'].get('tran', 'Unknown') == 'nvme': str(dev['lsblk'].get('tran', '???')).strip().upper().replace(
print_standard(' {:8}{}'.format('type', 'NVMe')) 'NVME', 'NVMe'),
else: str(dev['lsblk'].get('model', 'Unknown Model')).strip(),
print_standard(' {:8}{}'.format( str(dev['lsblk'].get('serial', 'Unknown Serial')).strip(),
'type', ))
dev['lsblk'].get('tran', 'Unknown').upper()))
# Warnings # Warnings
if dev.get('NVMe Disk', False): if dev.get('NVMe Disk', False):