Merge pull request #4220 from dagwieers/setup-dmidecode-fix

Fix for commented dmidecode output
2013-09-24 05:04:33 -07:00 · 2013-09-24 05:04:33 -07:00 · eca73d3c82
commit eca73d3c82
parent 497b742935 b4cdd15843
1 changed files with 2 additions and 1 deletions
--- a/system/setup
+++ b/system/setup
@ -629,7 +629,8 @@ class LinuxHardware(Hardware):
                if dmi_bin is not None:
                    (rc, out, err) = module.run_command('%s -s %s' % (dmi_bin, v))
                    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:
                        self.facts[k] = 'NA'
                else: