Only add cc's if we're not doing "onlyto"

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 18 insertions, 16 deletions

diff --git a/git-patchwork-bot.py b/git-patchwork-bot.py
index fa036fb..b357c1b 100755
--- a/git-patchwork-bot.py
+++ b/git-patchwork-bot.py
@@ -751,16 +751,6 @@ def notify_submitters(serieslist, refname, revs, pname, rs, hs):
         msg['References'] = Header(reference)
         msg['In-Reply-To'] = Header(reference)
 
-        ccaddrs = list()
-        if tweaks.get('alwayscc'):
-            ccaddrs += listify(tweaks['alwayscc'])
-        if tweaks.get('cclist'):
-            ccaddrs.append(project.get('list_email'))
-        if tweaks.get('ccall'):
-            for addr in tos + ccs:
-                if addr not in ccaddrs:
-                    ccaddrs.append(addr)
-
         if 'onlyto' in tweaks:
             targets = listify(tweaks['onlyto'])
             msg['To'] = '%s <%s>' % (submitter.get('name'), targets[0])
@@ -768,12 +758,24 @@ def notify_submitters(serieslist, refname, revs, pname, rs, hs):
             targets = [submitter.get('email')]
             msg['To'] = Header('%s <%s>' % (submitter.get('name'), submitter.get('email')))
 
-        targets += ccaddrs
-        if 'alwaysbcc' in tweaks:
-            targets += listify(tweaks['alwaysbcc'])
-
-        if len(ccaddrs):
-            msg['Cc'] = ', '.join(ccaddrs)
+            ccaddrs = list()
+            if tweaks.get('alwayscc'):
+                ccaddrs += listify(tweaks['alwayscc'])
+                targets += ccaddrs
+            if tweaks.get('cclist'):
+                ccaddrs.append(project.get('list_email'))
+                targets.append(project.get('list_email'))
+            if tweaks.get('ccall'):
+                for addr in tos + ccs:
+                    if addr not in targets:
+                        targets.append(addr)
+                        ccaddrs.append(addr)
+
+            if 'alwaysbcc' in tweaks:
+                targets += listify(tweaks['alwaysbcc'])
+
+            if len(ccaddrs):
+                msg['Cc'] = ', '.join(ccaddrs)
 
         if not NOMAIL:
             logger.debug('Message follows')