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

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

 



Chris Lumens <clumens@xxxxxxxxxx> 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@xxxxxxxxxx>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Honolulu, HI | UTC-10

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux