From: Willem Jan Withagen <wjw@digiware.nl>
Date: Fri, 14 Jul 2017 08:54:32 +0000 (+0200)
Subject: ceph_disk/main.py: fixed bugs from theutology report
X-Git-Tag: v12.1.1~15^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f7330a5a026613979ed3302fa0a28a1e903403d0;p=ceph-ci.git

ceph_disk/main.py: fixed bugs from theutology report

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index ff3b93966f3..ddc6bcfa23d 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -671,9 +671,7 @@ def stmode_is_diskdevice(dmode):
     else:
         # FreeBSD does not have block devices
         # All disks are character devices
-        if FREEBSD and stat.S_ISCHR(dmode):
-            return True
-    return False
+        return FREEBSD and stat.S_ISCHR(dmode)
 
 
 def dev_is_diskdevice(dev):
@@ -803,7 +801,7 @@ def get_partition_base(dev):
     Get the base device for a partition
     """
     dev = os.path.realpath(dev)
-    if ldev_is_diskdevice(dev):
+    if not ldev_is_diskdevice(dev):
         raise Error('not a block device', dev)
 
     name = get_dev_name(dev)
@@ -845,7 +843,7 @@ def is_partition(dev):
 
     dev = os.path.realpath(dev)
     st = os.lstat(dev)
-    if not stmode_is_diskdevice(st.mode):
+    if not stmode_is_diskdevice(st.st_mode):
         raise Error('not a block device', dev)
 
     name = get_dev_name(dev)