summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--exception.py14
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c360e4d7..49842c575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
2006-02-17 Chris Lumens <clumens@redhat.com>
+ * exception.py (handleException): Reboot after writing to floppy or
+ remote (#181745).
+
* yuminstall.py (simpleCallback.callback): Try again to get fn.
* anaconda: Don't traceback if we find an included file that doesn't
diff --git a/exception.py b/exception.py
index 4e97fd880..8877b07a7 100644
--- a/exception.py
+++ b/exception.py
@@ -419,9 +419,10 @@ def handleException(dispatch, intf, (type, value, tb)):
if floppyRc == 0:
intf.messageWindow(_("Dump Written"),
_("Your system's state has been successfully written to "
- "the floppy. Your system will now be rebooted."))
- intf.__del__ ()
- os.kill(os.getpid(), signal.SIGKILL)
+ "the floppy. Your system will now be rebooted."),
+ type="custom", custom_icon="info",
+ custom_buttons=[_("_Reboot")])
+ sys.exit(0)
elif floppyRc == 1:
continue
elif floppyRc == 2:
@@ -435,9 +436,10 @@ def handleException(dispatch, intf, (type, value, tb)):
if scpRc == 0:
intf.messageWindow(_("Dump Written"),
_("Your system's state has been successfully written to "
- "the remote host.\nYour system will now be reset."))
- intf.__del__ ()
- os.kill(os.getpid(), signal.SIGKILL)
+ "the remote host.\nYour system will now be reset."),
+ type="custom", custom_icon="info",
+ custom_buttons=[_("_Reboot")])
+ sys.exit(0)
elif scpRc == 1:
continue
elif scpRc == 2: