The following couple of patches amend error handling when anaconda fails to install the bootloader. Previously, such a failure caused the installer to crash, but a warning pop-up now gets displayed to users in such an event.
This resolves rhbz#730023.
--- iutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iutil.py b/iutil.py index 3e3f903..4553816 100644 --- a/iutil.py +++ b/iutil.py @@ -245,7 +245,7 @@ def execWithCapture(command, argv, stdin = None, stderr = None, root='/', # if we have anything other than a clean exit, and we get the fatal # option, raise the OSError. if proc.returncode and fatal: - raise OSError('Non-zero return code: %s' % proc.returncode) + raise OSError(proc.returncode, errStr) except OSError as e: log.error ("Error running " + command + ": " + e.strerror) closefds()
this used to crash the installer previously, which is less than ideal
Resolves: rhbz#730023 --- bootloader.py | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/bootloader.py b/bootloader.py index fb54196..a67b0d9 100644 --- a/bootloader.py +++ b/bootloader.py @@ -249,6 +249,12 @@ def writeBootloader(anaconda): _("No kernel packages were installed on the " "system. Bootloader configuration " "will not be changed.")) + except RuntimeError: + w.pop() + if anaconda.intf: + anaconda.intf.messageWindow(_("Warning"), + _("There was an error installing the bootloader. " + "The system may not be bootable"))
dosync()
On Mon, Jan 07, 2013 at 10:52:54AM -0500, Samantha N. Bueno wrote:
The following couple of patches amend error handling when anaconda fails to install the bootloader. Previously, such a failure caused the installer to crash, but a warning pop-up now gets displayed to users in such an event.
This resolves rhbz#730023.
Ack.
To make things a bit clearer I usually set the subject to the branch name(s) when it isn't master. eg. [rhel6-branch 1/2]
you can do this with git format-patch --subject-prefix=rhel6-branch
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Samantha N. Bueno