From 1e6672bfda9131eedb6adf158cddd19091e1d8c7 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 13 May 2014 16:41:32 +0300 Subject: notifications: make notify() more generic In order to be able to re-use it in gbp-buildpackage-rpm. Signed-off-by: Markus Lehtonen --- 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 9d9071a9..d628b269 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 04971594..4aac21b5 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 -- cgit v1.2.3