summaryrefslogtreecommitdiffstats
path: root/roles/git/hooks/files
diff options
context:
space:
mode:
authorPierre-Yves Chibon <pingou@pingoured.fr>2017-01-16 10:24:20 +0100
committerPierre-Yves Chibon <pingou@pingoured.fr>2017-01-16 10:24:30 +0100
commit083901a3129e1a36ffe1943fdd84c2fd2229204a (patch)
treea86d038270212a81a6488842e174b9971b6e1906 /roles/git/hooks/files
parent4fe0981401494f09d835bbcd2210fe15f5fb75c3 (diff)
downloadansible-083901a3129e1a36ffe1943fdd84c2fd2229204a.tar.gz
ansible-083901a3129e1a36ffe1943fdd84c2fd2229204a.tar.xz
ansible-083901a3129e1a36ffe1943fdd84c2fd2229204a.zip
Fix detecting %ifarch/%ifnarch upon commit and improve the email content
Diffstat (limited to 'roles/git/hooks/files')
-rwxr-xr-xroles/git/hooks/files/post-receive-alternativearch6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/git/hooks/files/post-receive-alternativearch b/roles/git/hooks/files/post-receive-alternativearch
index 15706f396..10f3f6f7a 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: