# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1467736002 -10800
# Node ID b87dbc887f63e0885cde695c4470ef2fa62a6d25
# Parent  54644b29a9a3b87e6e24e8c3f2b91b9217fcf6c9
Simplify.

diff -r 54644b29a9a3 -r b87dbc887f63 multimerge.py
--- a/multimerge.py	Tue Jul 05 18:51:25 2016 +0300
+++ b/multimerge.py	Tue Jul 05 19:26:42 2016 +0300
@@ -371,16 +371,13 @@
 
         # If summary or summaryOverride match the regexp, add calendar
         mre = src_re.match(calendar["summary"])
+        if not mre and u"summaryOverride" in calendar:
+            mre = src_re.match(calendar[u"summaryOverride"])
+
         if mre:
             calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
             calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
             src_calendars.append(calendar)
-        elif u"summaryOverride" in calendar:
-            mre = src_re.match(calendar[u"summaryOverride"])
-            if mre:
-                calendar["gcm_title"] = mre.group(cfg.source_regmap[0])
-                calendar["gcm_id"] = mre.group(cfg.source_regmap[1])
-                src_calendars.append(calendar)
 
 gcm_debug(u"{0} source calendars found.".format(len(src_calendars)))