]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume util.disk st_mode is needed for stat()
authorAlfredo Deza <adeza@redhat.com>
Fri, 20 Oct 2017 13:23:35 +0000 (09:23 -0400)
committerAlfredo Deza <adeza@redhat.com>
Fri, 27 Oct 2017 14:44:21 +0000 (10:44 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e3b5663f7968e44ec0cd6db2bfc43acdb233e314)

src/ceph-volume/ceph_volume/util/disk.py

index 6d1cf567714d731ac1d05e365337c0ab031320ea..da3dc93413ced3190a4e74c8ad564d5c9cb30e45 100644 (file)
@@ -154,7 +154,7 @@ def is_device(dev):
         return TYPE == 'disk'
 
     # fallback to stat
-    return _stat_is_device(os.lstat(dev))
+    return _stat_is_device(os.lstat(dev).st_mode)
     if stat.S_ISBLK(os.lstat(dev)):
         return True
     return False
@@ -173,7 +173,7 @@ def is_partition(dev):
 
     # fallback to stat
     stat_obj = os.stat(dev)
-    if _stat_is_device(stat_obj):
+    if _stat_is_device(stat_obj.st_mode):
         return False
 
     major = os.major(stat_obj.st_rdev)