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

Re: [PATCH 3/4] Fix test for unsupported format type in kickstart.



On Mon, Feb 27, 2012 at 04:37:16PM -0600, David Lehman wrote:
> ---
>  pyanaconda/kickstart.py |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> index aede8da..23c624a 100644
> --- a/pyanaconda/kickstart.py
> +++ b/pyanaconda/kickstart.py
> @@ -559,7 +559,7 @@ class LogVolData(commands.logvol.F15_LogVolData):
>                             label=self.label,
>                             fsprofile=self.fsprofile,
>                             mountopts=self.fsopts)
> -        if not format:
> +        if not format.type:
>              raise KickstartValueError, formatErrorMsg(self.lineno, msg="The \"%s\" filesystem type is not supported." % type)
>  
>          # If we were given a pre-existing LV to create a filesystem on, we need
> @@ -878,7 +878,7 @@ class PartitionData(commands.partition.F12_PartData):
>                                       label=self.label,
>                                       fsprofile=self.fsprofile,
>                                       mountopts=self.fsopts)
> -        if not kwargs["format"]:
> +        if not kwargs["format"].type:
>              raise KickstartValueError, formatErrorMsg(self.lineno, msg="The \"%s\" filesystem type is not supported." % type)
>  
>          # If we were given a specific disk to create the partition on, verify
> @@ -1051,7 +1051,7 @@ class RaidData(commands.raid.F15_RaidData):
>                                       fsprofile=self.fsprofile,
>                                       mountpoint=self.mountpoint,
>                                       mountopts=self.fsopts)
> -        if not kwargs["format"]:
> +        if not kwargs["format"].type:
>              raise KickstartValueError, formatErrorMsg(self.lineno, msg="The \"%s\" filesystem type is not supported." % type)
>  
>          kwargs["name"] = devicename
> -- 
> 1.7.7.6

I think all of these should test if not format or not format.type since
getFormat() can return None.

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

Attachment: pgporvwpQAiJm.pgp
Description: PGP signature


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