mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
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>
This commit is contained in:
parent
81bfb367c8
commit
d87b138a89
1 changed files with 4 additions and 2 deletions
|
@ -242,7 +242,8 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None):
|
||||||
refs = '[1] ' + user_uri + '\n'
|
refs = '[1] ' + user_uri + '\n'
|
||||||
refs += '[2] ' + pkgbase_uri + '\n'
|
refs += '[2] ' + pkgbase_uri + '\n'
|
||||||
thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>'
|
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)
|
send_notification(to, subject, body, refs, headers)
|
||||||
|
|
||||||
|
@ -263,7 +264,8 @@ def request_close(cur, uid, reqid, reason):
|
||||||
body += ':\n\n' + text
|
body += ':\n\n' + text
|
||||||
refs = '[1] ' + user_uri
|
refs = '[1] ' + user_uri
|
||||||
thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>'
|
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)
|
send_notification(to, subject, body, refs, headers)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue