From 083901a3129e1a36ffe1943fdd84c2fd2229204a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 16 Jan 2017 10:24:20 +0100 Subject: [PATCH] Fix detecting %ifarch/%ifnarch upon commit and improve the email content --- roles/git/hooks/files/post-receive-alternativearch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/git/hooks/files/post-receive-alternativearch b/roles/git/hooks/files/post-receive-alternativearch index 15706f3961..10f3f6f7a1 100755 --- a/roles/git/hooks/files/post-receive-alternativearch +++ b/roles/git/hooks/files/post-receive-alternativearch @@ -17,7 +17,7 @@ import sys from email.mime.text import MIMEText abspath = os.path.abspath(os.environ['GIT_DIR']) -PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+ifarch', '+ifnarch') +PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+%ifarch', '+%ifnarch') FROM_EMAIL = 'githook-noreply@fedoraproject.org' TO_MAIL = 'arch-excludes@lists.fedoraproject.org' CGIT_URL = 'http://pkgs.fedoraproject.org/cgit/%s/commit/?id=%s' @@ -27,8 +27,8 @@ SMTP_PORT = 25 DEBUG = False TEXT = u""" -The package %(pkg)s has added or updated either ExclusiveArch or ExcludesArch -in commit(s): +The package %(pkg)s has added or updated architecture specific content in its +spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): %(url)s. Change: