[rhel7] Fix a bad cherry-pick in an error handler
Brian C. Lane
bcl at redhat.com
Wed Nov 19 15:25:02 UTC 2014
On Wed, Nov 19, 2014 at 10:11:28AM -0500, David Shea wrote:
> Related: rhbz#1057032
> ---
> pyanaconda/errors.py | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/pyanaconda/errors.py b/pyanaconda/errors.py
> index e2da7f1..c7197e8 100644
> --- a/pyanaconda/errors.py
> +++ b/pyanaconda/errors.py
> @@ -254,8 +254,9 @@ class ErrorHandler(object):
> self.ui.showDetailedError(message, details)
> return ERROR_RAISE
>
> - def _passwordCryptErrorHandler(self, exn):
> - message = _("Unable to encrypt password: unsupported algorithm %s") % exn.algo
> + def _passwordCryptErrorHandler(self, *args, **kwargs):
> + message = _("Unable to encrypt password: unsupported algorithm %s") % \
> + kwargs["exception"].algo
>
> self.ui.showError(message)
> return ERROR_RAISE
> --
> 2.1.0
Ack
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
More information about the anaconda-patches
mailing list