[PATCH 1/2] Don't display "(null)" as a MountpointSelector's mountpoint.

Brian C. Lane bcl at redhat.com
Thu Feb 28 01:12:25 UTC 2013


On Wed, Feb 27, 2013 at 10:15:55AM -0500, Chris Lumens wrote:
> ---
>  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

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 482 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20130227/359348cb/attachment.sig>


More information about the anaconda-patches mailing list