summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-25 17:45:32 +0100
committerSage Weil <sage@inktank.com>2013-04-26 13:40:06 -0700
commitd714049d530dc9611cf5f2fcb9b272c355dbe9f1 (patch)
tree971bf83946d6831a1922475a848f3b10a8bd4511
parentecb34b81b843adaf9455503eb3ecc69ea94652a3 (diff)
downloadceph-d714049d530dc9611cf5f2fcb9b272c355dbe9f1.tar.gz
ceph-disk: rename some local variabels in list_*partitions
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit b7d7e6894c550a7afa8dfb5bfa2bc54b5d331178)
-rwxr-xr-xsrc/ceph-disk28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 54d53773923..4bf3cc7c7dc 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -130,26 +130,26 @@ def list_all_partitions():
"""
Return a list of devices and partitions
"""
- ls = {}
- with file('/proc/partitions', 'rb') as f:
- for line in f.read().split('\n')[2:]:
+ dev_part_list = {}
+ with file('/proc/partitions', 'rb') as proc_partitions:
+ for line in proc_partitions.read().split('\n')[2:]:
fields = re.split('\s+', line)
if len(fields) < 5:
continue
name = fields[4]
name = '/dev/' + name
if "dm-" in name:
- if "/dev/dm" not in ls:
- ls["/dev/dm"] = []
- ls["/dev/dm"].append(name)
+ if "/dev/dm" not in dev_part_list:
+ dev_part_list["/dev/dm"] = []
+ dev_part_list["/dev/dm"].append(name)
if name[-1].isdigit():
base = name
while base[-1].isdigit():
base = base[:-1]
- ls[base].append(name)
+ dev_part_list[base].append(name)
else:
- ls[name] = []
- return ls
+ dev_part_list[name] = []
+ return dev_part_list
def list_partitions(disk):
@@ -160,16 +160,16 @@ def list_partitions(disk):
assert not is_partition(disk)
assert disk.startswith('/dev/')
base = disk[5:]
- ls = []
- with file('/proc/partitions', 'rb') as f:
- for line in f.read().split('\n')[2:]:
+ partitions = []
+ with file('/proc/partitions', 'rb') as proc_partitions:
+ for line in proc_partitions.read().split('\n')[2:]:
fields = re.split('\s+', line)
if len(fields) < 5:
continue
name = fields [4]
if name != base and name.startswith(base):
- ls.append('/dev/' + name)
- return ls
+ partitions.append('/dev/' + name)
+ return partitions
def is_partition(dev):