[master][PATCH] Pass the actual format instead of Python built-in (#1009678)

David Lehman dlehman at redhat.com
Tue Sep 24 14:07:17 UTC 2013


On Tue, 2013-09-24 at 09:13 -0400, Vratislav Podzimek wrote:
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>

Ack, pending removal of Eula chunk.

> ---
>  pyanaconda/kickstart.py | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> index 13160d9..603d957 100644
> --- a/pyanaconda/kickstart.py
> +++ b/pyanaconda/kickstart.py
> @@ -625,9 +625,8 @@ class Lang(commands.lang.F19_Lang):
>      def execute(self, *args, **kwargs):
>          localization.write_language_configuration(self, ROOT_PATH)
>  
> -class Eula(commands.eula.F20_Eula):
> -    # no overrides needed here
> -    pass
> +# no overrides needed here
> +class Eula = commands.eula.F20_Eula
>  
>  class LogVol(commands.logvol.F20_LogVol):
>      def execute(self, storage, ksdata, instClass):
> @@ -755,7 +754,7 @@ class LogVolData(commands.logvol.F20_LogVolData):
>                      raise KickstartValueError(formatErrorMsg(self.lineno,
>                              msg="Invalid target size (%d) for device %s" % (self.size, device.name)))
>  
> -            devicetree.registerAction(ActionCreateFormat(device, format))
> +            devicetree.registerAction(ActionCreateFormat(device, fmt))
>          else:
>              # If a previous device has claimed this mount point, delete the
>              # old one.




More information about the anaconda-patches mailing list