RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: rename some local variabels in list_*partitions

Browse Source 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
This commit is contained in:
Danny Al-Gaaf 2013-03-25 17:45:32 +01:00
parent 0b5fcfffe6
commit b7d7e6894c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ceph-disk
View File

@ -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):