From 9ed599b15c3af8b1bfae0cb8c24a22c8d46e7992 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 04 2015 15:29:16 +0000 Subject: [PATCH 1/3] Stop the pagure hook if the user is deleting a branch --- diff --git a/pagure/hooks/files/pagure_hook.py b/pagure/hooks/files/pagure_hook.py index 9a8de4c..b971819 100755 --- a/pagure/hooks/files/pagure_hook.py +++ b/pagure/hooks/files/pagure_hook.py @@ -153,6 +153,11 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname + if set(newrev) = set(['0']): + print "Deleting a reference/branch, so we won't run the "\ + "pagure hook" + return + generate_revision_change_log( pagure.lib.git.get_revs_between(oldrev, newrev, abspath)) From c43f06d5d87626b9270a1bd41dbb8241eb27eff9 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 04 2015 15:31:34 +0000 Subject: [PATCH 2/3] Fix all the hooks in pagure to not run if the user is deleting a branch --- diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 443c47f..89a93eb 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -59,6 +59,12 @@ seen = [] # Read in all the rev information git-receive-pack hands us. for line in sys.stdin.readlines(): (oldrev, newrev, refname) = line.strip().split(' ', 2) + + if set(newrev) = set(['0']): + print "Deleting a reference/branch, so we won't run the "\ + "pagure hook" + return + revs = pagure.lib.git.get_revs_between(oldrev, newrev, abspath) project = pagure.lib.git.get_repo_name(abspath) diff --git a/pagure/hooks/files/pagure_hook_requests.py b/pagure/hooks/files/pagure_hook_requests.py index 8b05657..9d2b8cd 100755 --- a/pagure/hooks/files/pagure_hook_requests.py +++ b/pagure/hooks/files/pagure_hook_requests.py @@ -56,6 +56,11 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname + if set(newrev) = set(['0']): + print "Deleting a reference/branch, so we won't run the "\ + "pagure hook" + return + tmp = set(get_files_to_load( pagure.lib.git.get_revs_between(oldrev, newrev, abspath))) file_list = file_list.union(tmp) diff --git a/pagure/hooks/files/pagure_hook_tickets.py b/pagure/hooks/files/pagure_hook_tickets.py index dfa439a..5c708a7 100755 --- a/pagure/hooks/files/pagure_hook_tickets.py +++ b/pagure/hooks/files/pagure_hook_tickets.py @@ -56,6 +56,11 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname + if set(newrev) = set(['0']): + print "Deleting a reference/branch, so we won't run the "\ + "pagure hook" + return + tmp = set(get_files_to_load( pagure.lib.git.get_revs_between(oldrev, newrev, abspath))) file_list = file_list.union(tmp) From 33b2ee9255addbc098c3fa81401d75eeee4ff1a7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 04 2015 15:35:22 +0000 Subject: [PATCH 3/3] If works with `==` not `=` --- diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 89a93eb..d595678 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -60,7 +60,7 @@ seen = [] for line in sys.stdin.readlines(): (oldrev, newrev, refname) = line.strip().split(' ', 2) - if set(newrev) = set(['0']): + if set(newrev) == set(['0']): print "Deleting a reference/branch, so we won't run the "\ "pagure hook" return diff --git a/pagure/hooks/files/pagure_hook.py b/pagure/hooks/files/pagure_hook.py index b971819..98b12da 100755 --- a/pagure/hooks/files/pagure_hook.py +++ b/pagure/hooks/files/pagure_hook.py @@ -153,7 +153,7 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname - if set(newrev) = set(['0']): + if set(newrev) == set(['0']): print "Deleting a reference/branch, so we won't run the "\ "pagure hook" return diff --git a/pagure/hooks/files/pagure_hook_requests.py b/pagure/hooks/files/pagure_hook_requests.py index 9d2b8cd..49d5233 100755 --- a/pagure/hooks/files/pagure_hook_requests.py +++ b/pagure/hooks/files/pagure_hook_requests.py @@ -56,7 +56,7 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname - if set(newrev) = set(['0']): + if set(newrev) == set(['0']): print "Deleting a reference/branch, so we won't run the "\ "pagure hook" return diff --git a/pagure/hooks/files/pagure_hook_tickets.py b/pagure/hooks/files/pagure_hook_tickets.py index 5c708a7..5e464a7 100755 --- a/pagure/hooks/files/pagure_hook_tickets.py +++ b/pagure/hooks/files/pagure_hook_tickets.py @@ -56,7 +56,7 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname - if set(newrev) = set(['0']): + if set(newrev) == set(['0']): print "Deleting a reference/branch, so we won't run the "\ "pagure hook" return