[git-buildpackage] [PATCH 02/11] notifications: make notify() more generic

[Guido Günther]

On Tue, May 13, 2014 at 04:41:32PM +0300, Markus Lehtonen wrote:
> In order to be able to re-use it in gbp-buildpackage-rpm.
> 
> Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
> ---
>  gbp/notifications.py        |  5 ++---
>  gbp/scripts/buildpackage.py | 11 ++++++-----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/gbp/notifications.py b/gbp/notifications.py
> index 9d9071a..d628b26 100644
> --- a/gbp/notifications.py
> +++ b/gbp/notifications.py
> @@ -53,7 +53,7 @@ def send_notification(summary, msg):
>      return True
>  
>  
> -def notify(cp, success, notify_opt):
> +def notify(summary, message, notify_opt):
>      """
>      Send a notifications
>      @return: False on error
> @@ -66,6 +66,5 @@ def notify(cp, success, notify_opt):
>      if not enable:
>          return [True, False][notify_opt.is_on()]
>  
> -    summary, msg = build_msg(cp, success)
> -    return notify_opt.do(send_notification, summary, msg)
> +    return notify_opt.do(send_notification, summary, message)
>  
> diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
> index 0497159..4aac21b 100755
> --- a/gbp/scripts/buildpackage.py
> +++ b/gbp/scripts/buildpackage.py
> @@ -636,11 +636,12 @@ def main(argv):
>          if options.export_dir and options.purge and not retval:
>              RemoveTree(export_dir)()
>  
> -        if source and not gbp.notifications.notify(source.changelog,
> -                                                   not retval,
> -                                                   options.notify):
> -            gbp.log.err("Failed to send notification")
> -            retval = 1
> +        if source:
> +            summary, msg = gbp.notifications.build_msg(source.changelog,
> +                                                       not retval)
> +            if not gbp.notifications.notify(summary, msg, options.notify):
> +                gbp.log.err("Failed to send notification")
> +                retval = 1
>  
>      return retval

Applied. Thanks.
 -- Guido