summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-10-26 20:34:41 +0100
committerLukas Fleischer <lfleischer@archlinux.org>2015-11-12 11:47:20 +0100
commitd87b138a89f734995d33fa91ebdccca59f848673 (patch)
tree580f8dc7e331c3646936834440e173c693edb740
parent81bfb367c84b6a66b93a5ef7577622ec23b1882b (diff)
downloadaur-d87b138a89f734995d33fa91ebdccca59f848673.tar.gz
aur-d87b138a89f734995d33fa91ebdccca59f848673.tar.xz
notify: Fix merging of header dicts
Fixes another regression introduced in c764999 (notify: Split out email header generation, 2015-10-10). Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rwxr-xr-xscripts/notify.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/notify.py b/scripts/notify.py
index 4832baf7..d3d9cb0c 100755
--- a/scripts/notify.py
+++ b/scripts/notify.py
@@ -242,7 +242,8 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None):
refs = '[1] ' + user_uri + '\n'
refs += '[2] ' + pkgbase_uri + '\n'
thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>'
- headers = headers_msgid(thread_id) + headers_cc(cc)
+ headers = headers_reply(thread_id)
+ headers.update(headers_cc(cc))
send_notification(to, subject, body, refs, headers)
@@ -263,7 +264,8 @@ def request_close(cur, uid, reqid, reason):
body += ':\n\n' + text
refs = '[1] ' + user_uri
thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>'
- headers = headers_reply(thread_id) + headers_cc(cc)
+ headers = headers_reply(thread_id)
+ headers.update(headers_cc(cc))
send_notification(to, subject, body, refs, headers)