Merge "Check if dir exists before calling listdir" into stable/havana

openstack · Nov 13, 2013 · ad05556 · ad05556
2 parents 5f7d263 + fb8db56
commit ad05556
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cinder/brick/initiator/host_driver.py b/cinder/brick/initiator/host_driver.py
@@ -22,8 +22,10 @@ class HostDriver(object):
 
     def get_all_block_devices(self):
         """Get the list of all block devices seen in /dev/disk/by-path/."""
+        files = []
         dir = "/dev/disk/by-path/"
-        files = os.listdir(dir)
+        if os.path.isdir(dir):
+            files = os.listdir(dir)
         devices = []
         for file in files:
             devices.append(dir + file)