Fix for commented dmidecode output

This patch fixes the problem that on some system dmidecode prints out warning information as commented text. For example:

    [user@system ~]# dmidecode -s system-manufacturer
    # SMBIOS implementations newer than version 2.6 are not
    # fully supported by this version of dmidecode.
    HP

So we remove all commented lines from the output.
This commit is contained in:
Dag Wieers 2013-09-24 12:42:26 +02:00
parent ff2b87f350
commit b4cdd15843

View file

@ -629,7 +629,8 @@ class LinuxHardware(Hardware):
if dmi_bin is not None: if dmi_bin is not None:
(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:
self.facts[k] = out.rstrip() # Strip out commented lines (specific dmidecode output)
self.facts[k] = ''.join([ line for line in out.split('\n') if not line.startswith('#') ])
else: else:
self.facts[k] = 'NA' self.facts[k] = 'NA'
else: else: