[Yum-devel] [PATCH] Fix the indentation on key_installed.

[seth vidal]

On Tue, 2010-06-22 at 16:20 -0400, James Antill wrote:
> ---
>  yum/__init__.py |   28 +++++++++++++---------------
>  1 files changed, 13 insertions(+), 15 deletions(-)
> 
> diff --git a/yum/__init__.py b/yum/__init__.py
> index 73ec7c3..bd2c60a 100644
> --- a/yum/__init__.py
> +++ b/yum/__init__.py
> @@ -4286,13 +4286,13 @@ class YumBase(depsolve.Depsolve):
>                  self.logger.info(_('Key imported successfully'))
>                  key_installed = True
>  
> -                if not key_installed:
> -                    raise Errors.YumBaseError, \
> -                          _('The GPG keys listed for the "%s" repository are ' \
> -                          'already installed but they are not correct for this ' \
> -                          'package.\n' \
> -                          'Check that the correct key URLs are configured for ' \
> -                          'this repository.') % (repo.name)
> +        if not key_installed:
> +            raise Errors.YumBaseError, \
> +                  _('The GPG keys listed for the "%s" repository are ' \
> +                  'already installed but they are not correct for this ' \
> +                  'package.\n' \
> +                  'Check that the correct key URLs are configured for ' \
> +                  'this repository.') % (repo.name)
>  
>          # Check if the newly installed keys helped
>          result, errmsg = self.sigCheckPkg(po)
> @@ -4342,14 +4342,12 @@ class YumBase(depsolve.Depsolve):
>                  self.logger.info(_('Key imported successfully'))
>                  key_installed = True
>  
> -                if not key_installed:
> -                    raise Errors.YumBaseError, \
> -                          _('The GPG keys listed for the "%s" repository are ' \
> -                          'already installed but they are not correct for this ' \
> -                          'package.\n' \
> -                          'Check that the correct key URLs are configured for ' \
> -                          'this repository.') % (repo.name)
> -
> +        if not key_installed:
> +            raise Errors.YumBaseError, \
> +                  _('The GPG keys listed for the "%s" repository are ' \
> +                  'already installed but they are not correct.\n' \
> +                  'Check that the correct key URLs are configured for ' \
> +                  'this repository.') % (repo.name)
>  
>      def _limit_installonly_pkgs(self):
>          """ Limit packages based on conf.installonly_limit, if any of the


This means if the last key in the set gets installed - but the others do
NOT then we won't get that message?

Do you mean to change this more? Ie: to say 'all installed, some
installed' sort of error message?

-sv