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

Avoid crash if fstype is None

Browse source 
* Set fstype to 'UNKNOWN FS' if it's an empty string or None
* Ensure all v_data values are strings before replacing text
* Fixes issue #53 (again)
This commit is contained in:
2Shirt 2019-03-13 20:55:18 -06:00
parent 62e78cdc2c
commit e0c3716e08
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.bin/Scripts/functions/osticket.py
View file

@ -248,6 +248,10 @@ class osTicket():
# Ensure string type # Ensure string type
label = '' label = ''
fstype = v_data.get('fstype', 'UNKNOWN FS') fstype = v_data.get('fstype', 'UNKNOWN FS')
if not fstype:
# Either empty string or None
fstype = 'UNKNOWN FS'
fstype = str(fstype).upper()
size = v_data.get('size', '') size = v_data.get('size', '')
if size: if size:
size = '{} {}B'.format(size[:-1], size[-1:]).upper() size = '{} {}B'.format(size[:-1], size[-1:]).upper()
@ -256,6 +260,7 @@ class osTicket():
size_used = v_data.get('size_used', 'UNKNOWN').upper() size_used = v_data.get('size_used', 'UNKNOWN').upper()
size_avail = v_data.get('size_avail', 'UNKNOWN').upper() size_avail = v_data.get('size_avail', 'UNKNOWN').upper()
v_data = [v_path, label, size, fstype, size_used, size_avail] v_data = [v_path, label, size, fstype, size_used, size_avail]
v_data = [str(v) for v in v_data]
v_data = [v.strip().replace(' ', '_') for v in v_data] v_data = [v.strip().replace(' ', '_') for v in v_data]
for i in range(len(v_data)): for i in range(len(v_data)):
pad = 8 pad = 8