On Thu, Apr 19, 2018 at 2:07 AM, Kevin Fenzi <kevin@scrye.com> wrote:
Odd. Somehow my patch was not my patch. ;(

Here is the real one...

> diff --git a/roles/git/hooks/files/post-receive-chained b/roles/git/hooks/files/post-receive-chained
> index 5c74da4..99b5a2a 100755
> --- a/roles/git/hooks/files/post-receive-chained
> +++ b/roles/git/hooks/files/post-receive-chained
> @@ -8,7 +8,7 @@ pee \
>      /usr/share/git-core/post-receive-alternativearch \
>      /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \
>      /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
> -#    /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
> +    /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \
>      "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"

>  # We used to send emails directly from the git hook here, but now we send to
> diff --git a/roles/git/hooks/files/post-receive-chained-forks b/roles/git/hooks/files/post-receive-chained-forks
> index 67565e6..6f0fd88 100755
> --- a/roles/git/hooks/files/post-receive-chained-forks
> +++ b/roles/git/hooks/files/post-receive-chained-forks
> @@ -6,7 +6,6 @@
>  pee \
>      /usr/lib/python2.7/site-packages/pagure/hooks/files/default_hook.py \
>      /usr/lib/python2.7/site-packages/pagure/hooks/files/pagure_hook.py \
> -#   /usr/lib/python2.7/site-packages/pagure/hooks/files/fedmsg_hook.py \

This only removes the commented out line. We should actually fully revert
https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=dc86b22f9054bdcefd51e46db90433c03d54410c,
I believe.
 
>      "/usr/bin/grok-manifest -m /srv/git/grokmirror/manifest.js.gz -t /srv/git/repositories/ -n `pwd`"

>  # We used to send emails directly from the git hook here, but now we send to

kevin


_______________________________________________
infrastructure mailing list -- infrastructure@lists.fedoraproject.org
To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org