Fix issue 2906

89266849 · Ton Kersten · Michael DeHaan · 56e3cef6 · 89266849
Commit 89266849 authored May 15, 2013 by Ton Kersten Committed by Michael DeHaan May 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

library/system/setup
+9 -8

No files found.
--- a/library/system/setup
+++ b/library/system/setup
@@ -626,14 +626,15 @@ class LinuxHardware(Hardware):
                d['host'] = m.group(1)
            d['holders'] = []
-            for folder in os.listdir(sysdir + "/holders"):
+            if os.path.isdir(sysdir + "/holders"):
-                if not folder.startswith("dm-"):
+                for folder in os.listdir(sysdir + "/holders"):
-                    continue
+                    if not folder.startswith("dm-"):
-                name = get_file_content(sysdir + "/holders/" + folder + "/dm/name")
+                        continue
-                if name:
+                    name = get_file_content(sysdir + "/holders/" + folder + "/dm/name")
-                    d['holders'].append(name)
+                    if name:
-                else:
+                        d['holders'].append(name)
-                    d['holders'].append(folder)
+                    else:
+                        d['holders'].append(folder)
            self.facts['devices'][diskname] = d