# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1476787139 -10800
# Node ID 591cc558bbcd1c90cda1dc1d9729545b2fcd9dd6
# Parent  f45115bfb17a300548a33b4e08daf07c4fc2a1d1
Use summaryOverride field as summary for calendars where it is being matched
instead of the main summary field.

diff -r f45115bfb17a -r 591cc558bbcd multimerge.py
--- a/multimerge.py	Tue Oct 18 13:26:20 2016 +0300
+++ b/multimerge.py	Tue Oct 18 13:38:59 2016 +0300
@@ -539,7 +539,8 @@
         # 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"])
+            mre = src_re.match(calendar["summaryOverride"])
+            calendar["summary"] = calendar["summaryOverride"]
 
         if mre:
             calendar["gcm_title"] = mre.group(cfg.src_regmap[0])