Merge pull request #767 from sfromm/issue765

Catch exception if form factor id is unknown

Merge pull request #767 from sfromm/issue765
Catch exception if form factor id is unknown
a015c2e5 · Michael DeHaan · 38ed7ca7 · 9a3ad060 · a015c2e5
Commit a015c2e5 authored Aug 02, 2012 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

library/setup
+5 -1

No files found.
--- a/library/setup
+++ b/library/setup
@@ -250,7 +250,11 @@ class LinuxHardware(Hardware):
            data = get_file_content(path)
            if data is not None:
                if key == 'form_factor':
-                    self.facts['form_factor'] = LinuxHardware.FORM_FACTOR[int(data)]
+
+                    try:
+                        self.facts['form_factor'] = LinuxHardware.FORM_FACTOR[int(data)]
+                    except IndexError, e:
+                        self.facts['form_factor'] = 'unknown (%s)' % data
                else:
                    self.facts[key] = data
            else: