[aur-dev] [PATCH] notify: Fix merging of header dicts
Lukas Fleischer
lfleischer at archlinux.org
Mon Oct 26 19:38:00 UTC 2015
Fixes another regression introduced in c764999 (notify: Split out email
header generation, 2015-10-10).
Signed-off-by: Lukas Fleischer <lfleischer at archlinux.org>
---
scripts/notify.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/notify.py b/scripts/notify.py
index 4832baf..d3d9cb0 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)
--
2.6.2
More information about the aur-dev
mailing list