diff options
| author | Chris Lumens <clumens@redhat.com> | 2013-02-22 08:39:33 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2013-02-28 08:46:58 -0500 |
| commit | 6552f631e70f2abf136bb51d91cd0e148422f85a (patch) | |
| tree | 5155ce42d9c98b27046a21c7591e9efa500bad9e | |
| parent | 47c6635992e21270841c80ff62ff3c8eed38d5df (diff) | |
| download | anaconda-6552f631e70f2abf136bb51d91cd0e148422f85a.tar.gz anaconda-6552f631e70f2abf136bb51d91cd0e148422f85a.tar.xz anaconda-6552f631e70f2abf136bb51d91cd0e148422f85a.zip | |
Don't display "(null)" as a MountpointSelector's mountpoint.
| -rw-r--r-- | pyanaconda/ui/gui/spokes/lib/accordion.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py index aab671291..7c47c6ab3 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" |