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

Samantha N. Bueno sbueno+anaconda at redhat.com
Tue Nov 5 19:31:44 UTC 2013


(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"
 
 # for use in device names, eg: "fedora", "rhel"
 shortProductName = productName.lower()
diff --git a/pyanaconda/ui/tui/hubs/progress.py b/pyanaconda/ui/tui/hubs/progress.py
index 90d5731..b4bdf94 100644
--- a/pyanaconda/ui/tui/hubs/progress.py
+++ b/pyanaconda/ui/tui/hubs/progress.py
@@ -24,7 +24,7 @@ import sys
 
 from pyanaconda.flags import flags
 from pyanaconda.i18n import _
-from pyanaconda.constants import THREAD_INSTALL, THREAD_CONFIGURATION
+from pyanaconda.constants import THREAD_INSTALL, THREAD_CONFIGURATION, eulaLocation
 from pykickstart.constants import KS_SHUTDOWN, KS_REBOOT
 
 from pyanaconda.ui.tui.hubs import TUIHub
@@ -125,7 +125,7 @@ class ProgressHub(TUIHub):
         return True
 
     def prompt(self, args = None):
-        return(_("\tInstallation complete.  Press return to quit"))
+        return(_("\tUse of this product is subject to the license agreement found at %s\n\n\tInstallation complete.  Press return to quit" % eulaLocation))
 
     def input(self, args, key):
         # There is nothing to do here, just raise to exit the hub
-- 
1.8.3.1



More information about the anaconda-patches mailing list