[PATCH 1/2] Don't display "(null)" as a MountpointSelector's mountpoint.
Chris Lumens
clumens at redhat.com
Wed Feb 27 15:15:55 UTC 2013
---
pyanaconda/ui/gui/spokes/lib/accordion.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index aab6712..7c47c6a 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -69,7 +69,10 @@ def selectorFromDevice(device, selector=None, mountpoint=""):
allows for specifying the mountpoint if it cannot be determined from
the device (like for a Root specifying an existing installation).
"""
- mp = mountpoint or getattr(device.format, "mountpoint", "")
+ if hasattr(device.format, "mountpoint") and device.format.mountpoint is not None:
+ mp = device.format.mountpoint
+ else:
+ mp = mountpoint
if device.format.type == "swap":
name = "Swap"
--
1.8.1.2
More information about the anaconda-patches
mailing list