From df7d817c296ebc16a66bd05d12993a4706b4147f Mon Sep 17 00:00:00 2001 From: Mark Syms Date: Tue, 25 Feb 2025 09:11:16 +0000 Subject: [PATCH] CA-402814: rationalise canonicalisation of device path Signed-off-by: Mark Syms --- .gitignore | 1 + diskutil.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..485dee64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/diskutil.py b/diskutil.py index 8378a97c..b854f299 100644 --- a/diskutil.py +++ b/diskutil.py @@ -289,9 +289,9 @@ def getDiskBlockSize(dev): dev = '/dev/' + dev if isDeviceMapperNode(dev): return getDiskBlockSize(getDeviceSlaves(dev)[0]) - if dev.startswith("/dev/"): - dev = re.match("/dev/(.*)", dev).group(1) - dev = dev.replace("/", "!") + + realpath = os.path.realpath(dev) + dev = os.path.basename(realpath) return int(__readOneLineFile__("/sys/block/%s/queue/logical_block_size" % dev))