[PATCH 3/5] Fix handling of name=None in newLV, newMDArray, newVG.
David Lehman
dlehman at redhat.com
Fri Mar 22 16:48:14 UTC 2013
Getting name=None is the same as not getting a name at all.
---
blivet/__init__.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index cdb4bec..c3e7d81 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1015,8 +1015,8 @@ class Blivet(object):
None),
**kwargs.pop("fmt_args", {}))
- if kwargs.has_key("name"):
- name = kwargs.pop("name")
+ name = kwargs.pop("name", None)
+ if name:
safe_name = self.safeDeviceName(name)
if safe_name != name:
log.warning("using '%s' instead of specified name '%s'"
@@ -1038,8 +1038,8 @@ class Blivet(object):
if pv not in self.devices:
raise ValueError("pv is not in the device tree")
- if kwargs.has_key("name"):
- name = kwargs.pop("name")
+ name = kwargs.pop("name", None)
+ if name:
safe_name = self.safeDeviceName(name)
if safe_name != name:
log.warning("using '%s' instead of specified name '%s'"
@@ -1066,8 +1066,8 @@ class Blivet(object):
mountpoint=mountpoint,
**kwargs.pop("fmt_args", {}))
- if kwargs.has_key("name"):
- name = kwargs.pop("name")
+ name = kwargs.pop("name", None)
+ if name:
# make sure the specified name is sensible
safe_vg_name = self.safeDeviceName(vg.name)
full_name = "%s-%s" % (safe_vg_name, name)
--
1.8.1.4
More information about the anaconda-patches
mailing list