]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: rename some local variabels in list_*partitions
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Mon, 25 Mar 2013 16:45:32 +0000 (17:45 +0100)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 20:40:06 +0000 (13:40 -0700)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit b7d7e6894c550a7afa8dfb5bfa2bc54b5d331178)

src/ceph-disk

index 54d537739231d29a9cb78b19a728125337c0790d..4bf3cc7c7dcd09830062a5b4120c42b56f3ac956 100755 (executable)
@@ -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):