[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Don't crash when checking unpartitioned devices for disklabel. (#720070)



On Mon, Aug 08, 2011 at 01:45:27PM -0500, David Lehman wrote:
> ---
>  pyanaconda/bootloader.py |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 3a82dda..8ab6390 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -397,8 +397,8 @@ class BootLoader(object):
>          ret = True
>          if self.disklabel_types:
>              for disk in device.disks:
> -                label_type = disk.format.labelType
> -                if label_type not in self.disklabel_types:
> +                label_type = getattr(disk.format, "labelType", None)
> +                if not label_type or label_type not in self.disklabel_types:
>                      types_str = ",".join(disklabel_types)
>                      self.errors.append(_("%s must have one of the following "
>                                           "disklabel types: %s.")

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

Attachment: pgppC0f6IM5oV.pgp
Description: PGP signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]