From 36f0f9569bc6b63c2422b23e45a1f1eef43cb3e1 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mar 21 2018 18:50:13 +0000 Subject: [PATCH 1/2] Fix default hook Signed-off-by: Clement Verna --- diff --git a/pagure/hooks/files/default_hook.py b/pagure/hooks/files/default_hook.py index 964546f..0b3cf99 100644 --- a/pagure/hooks/files/default_hook.py +++ b/pagure/hooks/files/default_hook.py @@ -191,6 +191,7 @@ def run_as_post_receive_hook(): if not repo_obj.is_empty and not repo_obj.head_is_unborn: default_branch = repo_obj.head.shorthand + forced = False if set(newrev) == set(['0']): print("Deleting a reference/branch, so we won't run the " "pagure hook") From 6f4330d7957bcb3637a8df4e5884b8e5109c759a Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Mar 21 2018 19:11:38 +0000 Subject: [PATCH 2/2] Make sure the project fedmsg hook exist Signed-off-by: Clement Verna --- diff --git a/pagure/hooks/files/default_hook.py b/pagure/hooks/files/default_hook.py index 0b3cf99..984471f 100644 --- a/pagure/hooks/files/default_hook.py +++ b/pagure/hooks/files/default_hook.py @@ -101,7 +101,7 @@ def send_notifications(session, project, refname, revs, forced): fedmsg_hook = pagure.lib.plugins.get_plugin('Fedmsg') fedmsg_hook.db_object() - if project.fedmsg_hook.active: + if project.fedmsg_hook and project.fedmsg_hook.active: try: print(" - to fedmsg") send_fedmsg_notifications(project, topic, msg)