When env.Replace() is getting called with a list of Nodes, use a slice to...

site_scons/site_tools/chromium_builders.py

 # Copyright (c) 2006-2008 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.
 
 """
 Tool module for adding, to a construction environment, Chromium-specific
 wrappers around SCons builders.  This gives us a central place for any
 customization we need to make to the different things we build.
 """
 
 import sys
 
 from SCons.Script import *
 
 import SCons.Node
+import SCons.Util
 
 class Null(object):
   def __new__(cls, *args, **kwargs):
     if '_inst' not in vars(cls):
       cls._inst = super(type, cls).__new__(cls, *args, **kwargs)
     return cls._inst
   def __init__(self, *args, **kwargs): pass
   def __call__(self, *args, **kwargs): return self
   def __repr__(self): return "Null()"
   def __nonzero__(self): return False
@@ skipping 83 matching lines @@
           top.remove(element)
         except ValueError:
           pass
   def Replace(self, old, new):
     for top, lists, nonlists in FileListWalk(self, topdown=False):
       try:
         i = top.index(old)
       except ValueError:
         pass
       else:
-        top[i] = new
+        if SCons.Util.is_List(new):
+          top[i:i+1] = new
+        else:
+          top[i] = new
 
 
 def FilterOut(self, **kw):
   """Removes values from existing construction variables in an Environment.
 
   The values to remove should be a list.  For example:
 
   self.FilterOut(CPPDEFINES=['REMOVE_ME', 'ME_TOO'])
 
   Args:
@@ skipping 21 matching lines @@
 
 
 import __builtin__
 __builtin__.ChromeFileList = ChromeFileList
 
 non_compilable_suffixes = {
     'LINUX' : set([
         '.bdic',
         '.css',
         '.dat',
+        '.gperf',
         '.h',
         '.html',
         '.hxx',
         '.idl',
         '.js',
         '.rc',
     ]),
     'WINDOWS' : set([
         '.h',
         '.dat',
@@ skipping 84 matching lines @@
   # Add the grit tool to the base environment because we use this a lot.
   sys.path.append(env.Dir('$SRC_DIR/tools/grit').abspath)
   env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/grit/grit')])
 
   # Add the repack python script tool that we use in multiple places.
   sys.path.append(env.Dir('$SRC_DIR/tools/data_pack').abspath)
   env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/data_pack/')])
 
 def exists(env):
   return True