[rhel7-branch] Display a EULA-related warning on TUI progress hub at end of installation. (#909309)

David Cantrell dcantrell at redhat.com
Wed Nov 6 22:26:09 UTC 2013


On Wed, Nov 06, 2013 at 04:48:29PM +0100, Vratislav Podzimek wrote:
> On Wed, 2013-11-06 at 09:48 -0500, Samantha N. Bueno wrote:
> > On Wed, Nov 06, 2013 at 08:43:39AM +0100, Vratislav Podzimek wrote:
> > > On Tue, 2013-11-05 at 14:31 -0500, Samantha N. Bueno wrote:
> > > > (Ignore the other one.)
> > > > 
> > > > Related: rhbz#909309
> > > > ---
> > > >  pyanaconda/constants.py            | 1 +
> > > >  pyanaconda/ui/tui/hubs/progress.py | 4 ++--
> > > >  2 files changed, 3 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/pyanaconda/constants.py b/pyanaconda/constants.py
> > > > index 9b081fb..cf8a8ea 100644
> > > > --- a/pyanaconda/constants.py
> > > > +++ b/pyanaconda/constants.py
> > > > @@ -50,6 +50,7 @@ productVersion = product.productVersion
> > > >  productArch = product.productArch
> > > >  bugzillaUrl = product.bugUrl
> > > >  isFinal = product.isFinal
> > > > +eulaLocation = "/usr/share/redhat-release/EULA"
> > > Is this path correct? The Initial Setup uses
> > > "/usr/share/doc/redhat-release*/EULA*" as a glob and it seems to work.
> > 
> > Hmm--well, it was the path dcantrell instructed me to use yesterday
> > afternoon, so I believe it should be correct.
> I've just checked that the EULA file is under the
> '/usr/share/doc/redhat-release-VARIANT-RELEASE/' directory. But I guess
> that people can find it (if they want to).

The string has been moved to a non-variant specific file location.
initial-setup should use the new path if it can't find the EULA in the new
location.

-- 
David Cantrell <dcantrell at redhat.com>
Manager, Installer Engineering Team
Red Hat, Inc. | Westford, MA | EST5EDT


More information about the anaconda-patches mailing list