Partial revert of r211446

gclient_utils.py

 # Copyright (c) 2012 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.
 
 """Generic utils."""
 
 import codecs
 import logging
 import os
 import pipes
@@ skipping 180 matching lines @@
 def CheckCallAndFilterAndHeader(args, always=False, header=None, **kwargs):
   """Adds 'header' support to CheckCallAndFilter.
 
   If |always| is True, a message indicating what is being done
   is printed to stdout all the time even if not output is generated. Otherwise
   the message header is printed only if the call generated any ouput.
   """
   stdout = kwargs.setdefault('stdout', sys.stdout)
   if header is None:
     header = "\n________ running '%s' in '%s'\n" % (
-                 CommandToStr(args), kwargs.get('cwd', '.'))
+                 ' '.join(args), kwargs.get('cwd', '.'))
 
   if always:
     stdout.write(header)
   else:
     filter_fn = kwargs.get('filter_fn')
     def filter_msg(line):
       if line is None:
         stdout.write(header)
       elif filter_fn:
         filter_fn(line)
@@ skipping 665 matching lines @@
 
   Python on OSX 10.6 raises a NotImplementedError exception.
   """
   try:
     import multiprocessing
     return multiprocessing.cpu_count()
   except:  # pylint: disable=W0702
     # Mac OS 10.6 only
     # pylint: disable=E1101
     return int(os.sysconf('SC_NPROCESSORS_ONLN'))