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

Re: [PATCH 2/2] timeout= in yaboot.conf is in tenths of seconds (#692409)



Chris Lumens <clumens redhat com> wrote:

> > diff --git a/booty/ppc.py b/booty/ppc.py
> > index 9626d62..a7c6af8 100644
> > --- a/booty/ppc.py
> > +++ b/booty/ppc.py
> > @@ -70,7 +70,7 @@ class ppcBootloaderInfo(bootloaderInfo):
> >                  % productName)
> >  
> >          f.write("partition=%s\n" % partNumber)
> > -        f.write("timeout=%s\n" % (self.timeout or 80))
> > +        f.write("timeout=%s\n" % ((self.timeout * 10) or 80))
> >          f.write("install=/usr/lib/yaboot/yaboot\n")
> >          f.write("delay=5\n")
> >          f.write("enablecdboot\n")
>
> Should self.timeout ever be None (which the original expression is set
> up to handle), the multiplication will result in a TypeError.
>
> How about:  "(self.timeout or 8) * 10" instead?

Yeah, that's safer.  Changed.

-- 
David Cantrell <dcantrell redhat com>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Honolulu, HI | UTC-10


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