diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-10-22 11:03:42 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-10-23 13:21:10 -0400 |
| commit | b3e9da0dcbb7004da9b058bdc161a22d34ac4893 (patch) | |
| tree | b763ea665d4c6917961193adbc7fc5de6729868c /pyanaconda/errors.py | |
| parent | 24567c1355cd378ae24217d29138b35d86b1fb08 (diff) | |
| download | anaconda-b3e9da0dcbb7004da9b058bdc161a22d34ac4893.tar.gz anaconda-b3e9da0dcbb7004da9b058bdc161a22d34ac4893.tar.xz anaconda-b3e9da0dcbb7004da9b058bdc161a22d34ac4893.zip | |
payloadInstallHandler should only optionally take a package argument (#868542).
Diffstat (limited to 'pyanaconda/errors.py')
| -rw-r--r-- | pyanaconda/errors.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py index 89b76d566..17e75a0fd 100644 --- a/pyanaconda/errors.py +++ b/pyanaconda/errors.py @@ -214,10 +214,16 @@ class ErrorHandler(object): return ERROR_RAISE def _payloadInstallHandler(self, *args, **kwargs): - package = args[0] - message = _("There was an error installing the %s package. This is " - "a fatal error and installation will be aborted.") % \ - package + package = kwargs.pop("package", None) + if package: + message = _("There was an error installing the %s package. This is " + "a fatal error and installation will be aborted.") % \ + package + else: + message = _("The following error occurred while installing. This is " + "a fatal error and installation will be aborted.") + message += "\n\n" + str(kwargs["exception"]) + self.ui.showError(message) return ERROR_RAISE |