diff options
author | Sage Weil <sage@inktank.com> | 2013-07-03 11:01:39 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-07-24 15:46:37 -0700 |
commit | 056000346db09ea7274a22e57cf4b86a7ea4090e (patch) | |
tree | 1fb3fd6a9b7d02119e5d4bd1c2aaa0f8000d5585 | |
parent | f3ee3e690c42769229a6cd9ae8dec43f2aa22ecd (diff) | |
download | ceph-056000346db09ea7274a22e57cf4b86a7ea4090e.tar.gz |
ceph-disk: use get_dev_name() helper throughout
This is more robust than the broken split trick.
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 3359aaedde838c98d1155611e157fd2da9e8b9f5)
-rwxr-xr-x | src/ceph-disk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ceph-disk b/src/ceph-disk index 4ad4ccc5d9a..d088bcc60f4 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -298,7 +298,7 @@ def is_held(dev): """ assert os.path.exists(dev) dev = os.path.realpath(dev) - base = dev.split('/')[-1] + base = get_dev_name(dev) # full disk? directory = '/sys/block/{base}/holders'.format(base=base) @@ -1990,7 +1990,7 @@ def is_suppressed(path): try: if not disk.startswith('/dev/') or not stat.S_ISBLK(os.lstat(path).st_mode): return False - base = disk.split('/')[-1] + base = get_dev_name(disk) while len(base): if os.path.exists(SUPPRESS_PREFIX + base): return True @@ -2004,7 +2004,7 @@ def set_suppress(path): raise Error('does not exist', path) if not stat.S_ISBLK(os.lstat(path).st_mode): raise Error('not a block device', path) - base = disk.split('/')[-1] + base = get_dev_name(disk) with file(SUPPRESS_PREFIX + base, 'w') as f: pass @@ -2017,7 +2017,7 @@ def unset_suppress(path): if not stat.S_ISBLK(os.lstat(path).st_mode): raise Error('not a block device', path) assert disk.startswith('/dev/') - base = disk.split('/')[-1] + base = get_dev_name(disk) fn = SUPPRESS_PREFIX + base if not os.path.exists(fn): |