Merge Arrays in plist_util.py

build/config/mac/plist_util.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import plistlib
 import os
 import re
 import subprocess
 import sys
@@ skipping 123 matching lines @@
     subprocess.check_call(['plutil', '-convert', format, '-o', path, name])
   finally:
     os.unlink(name)
 
 
 def MergePList(plist1, plist2):
   """Merges |plist1| with |plist2| recursively.
 
   Creates a new dictionary representing a Property List (.plist) files by
   merging the two dictionary |plist1| and |plist2| recursively (only for
-  dictionary values).
+  dictionary values). List value will be concatenated.
 
   Args:
     plist1: a dictionary representing a Property List (.plist) file
     plist2: a dictionary representing a Property List (.plist) file
 
   Returns:
     A new dictionary representing a Property List (.plist) file by merging
     |plist1| with |plist2|. If any value is a dictionary, they are merged
-    recursively, otherwise |plist2| value is used.
+    recursively, otherwise |plist2| value is used. If values are list, they
+    are concatenated.
   """
   if not isinstance(plist1, dict) or not isinstance(plist2, dict):
     if plist2 is not None:
       return plist2
     else:
       return plist1
   result = {}
   for key in set(plist1) | set(plist2):
     if key in plist2:
       value = plist2[key]
     else:
       value = plist1[key]
     if isinstance(value, dict):
       value = MergePList(plist1.get(key, None), plist2.get(key, None))
+    if isinstance(value, list):
+      value = plist1.get(key, []) + plist2.get(key, [])
     result[key] = value
   return result
 
 
 class Action(object):
   """Class implementing one action supported by the script."""
 
   @classmethod
   def Register(cls, subparsers):
     parser = subparsers.add_parser(cls.name, help=cls.help)
@@ skipping 64 matching lines @@
 
   for action in [MergeAction, SubstituteAction]:
     action.Register(subparsers)
 
   args = parser.parse_args()
   args.func(args)
 
 
 if __name__ == '__main__':
   sys.exit(Main())