[f22-branch 1/3] Change raid variable name to raid_items (#1208536)
mulkieran
installerbot-noreply at redhat.com
Thu Apr 2 18:37:29 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/devicetree.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 49e9c57..b2688d1 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1444,7 +1444,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]"):
@@ -1455,14 +1455,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
@@ -1517,13 +1517,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/0a8c42ab567858fe7209c8710b13b449d8a8f8e2
More information about the anaconda-patches
mailing list