summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--iw/congrats_gui.py4
-rw-r--r--textw/complete_text.py10
3 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fd83f4aa..5044fb1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
* packages.py (selectLanguageSupportGroups, fixupConditionals,
selectPackageConditionals): Remove unused functions.
+ * iw/congrats_gui.py (CongratulationWindow.getScreen): Since you
+ can't always eject the CD, don't tell the user to do it (#137275).
+ * textw/complete_text.py (FinishedWindow.__call__): Likewise.
+
2007-03-13 Chris Lumens <clumens@redhat.com>
* anaconda.spec: Bump version.
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 3cf9ffbbc..d66a9067d 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -57,9 +57,7 @@ class CongratulationWindow (InstallWindow):
if rhpl.getArch() == "s390":
floppystr = ""
else:
- floppystr = _("Remove any media used during the installation "
- "process and press the \"Reboot\" button to "
- "reboot your system."
+ floppystr = _("Press the \"Reboot\" button to reboot your system."
"\n\n")
txt = _("Congratulations, the installation is complete.\n\n"
diff --git a/textw/complete_text.py b/textw/complete_text.py
index 0eeae37ba..0742bb4f6 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -23,14 +23,8 @@ class FinishedWindow:
def __call__ (self, screen, anaconda):
bootstr = ""
- if rhpl.getArch() == "s390":
- floppystr = _("Press <Enter> to end the installation process.\n\n")
- bottomstr = _("<Enter> to exit")
- else:
- floppystr = _("Remove any media used during the installation "
- "process and press <Enter> to reboot your system."
- "\n\n")
- bottomstr = _("<Enter> to reboot")
+ floppystr = _("Press <Enter> to end the installation process.\n\n")
+ bottomstr = _("<Enter> to exit")
screen.pushHelpLine (string.center(bottomstr, screen.width))