1 | Index: email2trac.py.in |
---|
2 | =================================================================== |
---|
3 | --- email2trac.py.in (revision 632) |
---|
4 | +++ email2trac.py.in (working copy) |
---|
5 | @@ -227,6 +227,8 @@ |
---|
6 | self.trac_smtp_from = self.get_config('notification', 'smtp_from') |
---|
7 | self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain') |
---|
8 | self.smtp_replyto = self.get_config('notification', 'smtp_replyto') |
---|
9 | + self.trac_smtp_always_cc = self.get_config('notification', 'smtp_always_cc') |
---|
10 | + self.trac_smtp_always_bcc = self.get_config('notification', 'smtp_always_bcc') |
---|
11 | |
---|
12 | |
---|
13 | self.system = None |
---|
14 | @@ -422,6 +424,7 @@ |
---|
15 | |
---|
16 | if update: |
---|
17 | self.logger.debug("\tupdate cc-fields") |
---|
18 | + email_cc = ticket['cc'] |
---|
19 | |
---|
20 | for name,addr in cc_addrs: |
---|
21 | |
---|
22 | @@ -437,7 +440,26 @@ |
---|
23 | self.logger.debug("\tSkipping reporter email address for CC-field") |
---|
24 | continue |
---|
25 | |
---|
26 | + ## Always remove the always_cc address |
---|
27 | + # |
---|
28 | + elif addr == self.trac_smtp_always_cc: |
---|
29 | + self.logger.debug("\tSkipping smtp_always_cc email address for CC-field") |
---|
30 | + continue |
---|
31 | + |
---|
32 | + ## Always remove the always_bcc address |
---|
33 | + # |
---|
34 | + elif addr == self.trac_smtp_always_bcc: |
---|
35 | + self.logger.debug("\tSkipping smtp_always_bcc email address for CC-field") |
---|
36 | + continue |
---|
37 | + |
---|
38 | else: |
---|
39 | + ## On update, prevent adding duplicates |
---|
40 | + # |
---|
41 | + if update: |
---|
42 | + cc_list = email_cc.split(',') |
---|
43 | + if addr in cc_list: |
---|
44 | + continue |
---|
45 | + |
---|
46 | if email_cc: |
---|
47 | email_cc = '%s, %s' %(email_cc, addr) |
---|
48 | else: |
---|