On Tue, Apr 07, 2015 at 05:29:11PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
...and thus work around the bug in os.minor

Signed-off-by: Klaus Aehlig <[email protected]>
---
lib/storage/bdev.py       | 4 ++--
lib/storage/extstorage.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/storage/bdev.py b/lib/storage/bdev.py
index 3df43fc..b392fba 100644
--- a/lib/storage/bdev.py
+++ b/lib/storage/bdev.py
@@ -817,7 +817,7 @@ class PersistentBlockDevice(base.BlockDev):
      return False

    self.major = os.major(st.st_rdev)
-    self.minor = os.minor(st.st_rdev)
+    self.minor = utils.osminor(st.st_rdev)
    self.attached = True

    return True
@@ -963,7 +963,7 @@ class RADOSBlockDevice(base.BlockDev):
      return False

    self.major = os.major(st.st_rdev)
-    self.minor = os.minor(st.st_rdev)
+    self.minor = utils.osminor(st.st_rdev)
    self.attached = True

    return True
diff --git a/lib/storage/extstorage.py b/lib/storage/extstorage.py
index 849bd60..3ddcaed 100644
--- a/lib/storage/extstorage.py
+++ b/lib/storage/extstorage.py
@@ -154,7 +154,7 @@ class ExtStorageDevice(base.BlockDev):
      return False

    self.major = os.major(st.st_rdev)
-    self.minor = os.minor(st.st_rdev)
+    self.minor = utils.osminor(st.st_rdev)
    self.attached = True

    return True
--
2.2.0.rc0.207.ga3a616c


LGTM

Reply via email to