diff --git a/.bin/Scripts/functions/disk.py b/.bin/Scripts/functions/disk.py index d39ca627..3864352a 100644 --- a/.bin/Scripts/functions/disk.py +++ b/.bin/Scripts/functions/disk.py @@ -335,7 +335,12 @@ def select_disk(title='Which disk?', disks=[]): # Build menu disk_options = [] for disk in disks: - display_name = '{Size}\t[{Table}] ({Type}) {Name}'.format(**disk) + display_name = '{}\t[{}] ({}) {}'.format( + disk.get('Size', ''), + disk.get('Table', ''), + disk.get('Type', ''), + disk.get('Name', 'Unknown'), + ) pwidth=len(str(len(disk['Partitions']))) for partition in disk['Partitions']: # Main text diff --git a/.bin/Scripts/functions/winpe_menus.py b/.bin/Scripts/functions/winpe_menus.py index 9c741d80..3b79df77 100644 --- a/.bin/Scripts/functions/winpe_menus.py +++ b/.bin/Scripts/functions/winpe_menus.py @@ -114,7 +114,12 @@ def menu_backup(): show_data(message='Ticket:', data=ticket_number) show_data( message = 'Source:', - data = '[{Table}] ({Type}) {Name} {Size}'.format(**disk), + data = '[{}] ({}) {} {}'.format( + disk.get('Table', ''), + disk.get('Type', ''), + disk.get('Name', 'Unknown'), + disk.get('Size', ''), + ), ) show_data( message = 'Destination:', @@ -293,7 +298,12 @@ def menu_setup(): show_data(message='Using Image:', data=windows_image['Path']) show_data( message = 'ERASING:', - data = '[{Table}] ({Type}) {Name} {Size}\n'.format(**dest_disk), + data = '[{}] ({}) {} {}\n'.format( + dest_disk.get('Table', ''), + dest_disk.get('Type', ''), + dest_disk.get('Name', 'Unknown'), + dest_disk.get('Size', ''), + ), warning = True) for par in dest_disk['Partitions']: show_data(