[master 1/5] Change raid variable name to raid_items (#1208536)

mulkieran installerbot-noreply at redhat.com
Tue Apr 7 12:57:41 UTC 2015


From: mulhern <amulhern at redhat.com>

Related: fed#1208536

So that raid module can be imported as is.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/populator.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/blivet/populator.py b/blivet/populator.py
index 2acfc1d..b1f5891 100644
--- a/blivet/populator.py
+++ b/blivet/populator.py
@@ -920,7 +920,7 @@ def addLV(lv):
                 rname = re.sub(r'_[rm]image.+', '', lv_name[1:-1])
                 name = "%s-%s" % (vg_name, rname)
                 addRequiredLV(name, "failed to look up raid lv")
-                raid[name]["copies"] += 1
+                raid_items[name]["copies"] += 1
                 return
             elif lv_attr[0] == 'e':
                 if lv_name.endswith("_pmspare]"):
@@ -931,14 +931,14 @@ def addLV(lv):
                 lv_name = re.sub(r'_[tr]meta.*', '', lv_name[1:-1])
                 name = "%s-%s" % (vg_name, lv_name)
                 addRequiredLV(name, "failed to look up raid lv")
-                raid[name]["meta"] += lv_size
+                raid_items[name]["meta"] += lv_size
                 return
             elif lv_attr[0] == 'l':
                 # log volume
                 rname = re.sub(r'_mlog.*', '', lv_name[1:-1])
                 name = "%s-%s" % (vg_name, rname)
                 addRequiredLV(name, "failed to look up log lv")
-                raid[name]["log"] = lv_size
+                raid_items[name]["log"] = lv_size
                 return
             elif lv_attr[0] == 't':
                 # thin pool
@@ -993,13 +993,13 @@ def addLV(lv):
                     # do format handling now
                     self.addUdevDevice(lv_info)
 
-        raid = dict((n.replace("[", "").replace("]", ""),
+        raid_items = dict((n.replace("[", "").replace("]", ""),
                      {"copies": 0, "log": Size(0), "meta": Size(0)})
                      for n in lv_info.keys())
         for lv in lv_info.values():
             addLV(lv)
 
-        for name, data in raid.items():
+        for name, data in raid_items.items():
             lv_dev = self.getDeviceByName(name)
             if not lv_dev:
                 # hidden lv, eg: pool00_tdata


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/1c177219ef88748b2700fe1bcad0ca2dbda7e770


More information about the anaconda-patches mailing list