From a945e7776309d39955918cec7e0c5f1895abc39b Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 20 Oct 2017 09:23:35 -0400 Subject: [PATCH] ceph-volume util.disk st_mode is needed for stat() Signed-off-by: Alfredo Deza (cherry picked from commit e3b5663f7968e44ec0cd6db2bfc43acdb233e314) --- src/ceph-volume/ceph_volume/util/disk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py index 6d1cf567714d7..da3dc93413ced 100644 --- a/src/ceph-volume/ceph_volume/util/disk.py +++ b/src/ceph-volume/ceph_volume/util/disk.py @@ -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) -- 2.39.5