[rhel6-branch] Fix traceback in s390x bootloader code. (#1017068)

Vratislav Podzimek vpodzime at redhat.com
Wed Oct 9 12:49:25 UTC 2013


On Wed, 2013-10-09 at 08:41 -0400, Samantha N. Bueno wrote:
> Failed on passing a bad argument to a function. Turns out it is
> pointless anyhow, so just remove it altogether.
> 
> Resolves: rhbz#1017068
> ---
>  booty/s390.py | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/booty/s390.py b/booty/s390.py
> index 29c15a2..97597b3 100644
> --- a/booty/s390.py
> +++ b/booty/s390.py
> @@ -126,7 +126,7 @@ class s390BootloaderInfo(bootloaderInfo):
>  
>          if not upgrade:
>              self.writeZiplConf(instRoot, bl, kernelList, chainList, defaultDev,
> -                                rootDev, upgrade=False)
> +                                rootDev)
>          else:
>              # at this point all we should have to do is set the boot device
>              # if all we are doing is upgrading
> @@ -134,7 +134,7 @@ class s390BootloaderInfo(bootloaderInfo):
>  
> 
>      def writeZiplConf(self, instRoot, bl, kernelList, chainList,
> -                  defaultDev, rootDev, justConfigFile):
> +                  defaultDev, rootDev):
>          cf = '/etc/zipl.conf'
>          self.perms = 0600
>          if os.access (instRoot + cf, os.R_OK):
> @@ -170,8 +170,7 @@ class s390BootloaderInfo(bootloaderInfo):
>  
>          f.close()
>  
> -        if not justConfigFile:
> -            self.prepBootDev(instRoot)
> +        self.prepBootDev(instRoot)
>  
>          return 0
Looks good to me.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list