1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Fixes #4796 handle unicodedecode errors from dmidecode output

This commit is contained in:
James Tanner 2013-12-02 11:56:38 -05:00
parent 04b031756c
commit c050872458

View file

@ -632,7 +632,13 @@ class LinuxHardware(Hardware):
(rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v)) (rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v))
if rc == 0: if rc == 0:
# Strip out commented lines (specific dmidecode output) # Strip out commented lines (specific dmidecode output)
self.facts[k] = ''.join([ line for line in out.split('\n') if not line.startswith('#') ]) thisvalue = ''.join([ line for line in out.split('\n') if not line.startswith('#') ])
try:
json.dumps(thisvalue)
except UnicodeDecodeError:
thisvalue = "NA"
self.facts[k] = thisvalue
else: else:
self.facts[k] = 'NA' self.facts[k] = 'NA'
else: else: