Make gclient_scm.py use cache_dir

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 cStringIO
 import logging
 import os
 import pipes
 import Queue
 import re
 import stat
 import subprocess
 import sys
 import tempfile
 import threading
@@ skipping 403 matching lines @@
                of the subprocess2's output. Each line has the trailing newline
                character trimmed.
     stdout: Can be any bufferable output.
     retry: If the process exits non-zero, sleep for a brief interval and try
            again, up to RETRY_MAX times.
 
   stderr is always redirected to stdout.
   """
   assert print_stdout or filter_fn
   stdout = stdout or sys.stdout
+  output = cStringIO.StringIO()
   filter_fn = filter_fn or (lambda x: None)
 
   sleep_interval = RETRY_INITIAL_SLEEP
   run_cwd = kwargs.get('cwd', os.getcwd())
   for _ in xrange(RETRY_MAX + 1):
     kid = subprocess2.Popen(
         args, bufsize=0, stdout=subprocess2.PIPE, stderr=subprocess2.STDOUT,
         **kwargs)
 
     GClientChildren.add(kid)
 
     # Do a flush of stdout before we begin reading from the subprocess2's stdout
     stdout.flush()
 
     # Also, we need to forward stdout to prevent weird re-ordering of output.
     # This has to be done on a per byte basis to make sure it is not buffered:
     # normally buffering is done for each line, but if svn requests input, no
     # end-of-line character is output after the prompt and it would not show up.
     try:
       in_byte = kid.stdout.read(1)
       if in_byte:
         if call_filter_on_first_line:
           filter_fn(None)
         in_line = ''
         while in_byte:
+          output.write(in_byte)
+          if print_stdout:
+            stdout.write(in_byte)
           if in_byte != '\r':
-            if print_stdout:
-              stdout.write(in_byte)
             if in_byte != '\n':
               in_line += in_byte
             else:
               filter_fn(in_line)
               in_line = ''
           else:
             filter_fn(in_line)
             in_line = ''
           in_byte = kid.stdout.read(1)
         # Flush the rest of buffered output. This is only an issue with
         # stdout/stderr not ending with a \n.
         if len(in_line):
           filter_fn(in_line)
       rv = kid.wait()
 
       # Don't put this in a 'finally,' since the child may still run if we get
       # an exception.
       GClientChildren.remove(kid)
 
     except KeyboardInterrupt:
       print >> sys.stderr, 'Failed while running "%s"' % ' '.join(args)
       raise
 
     if rv == 0:
-      return 0
+      return output.getvalue()

[agable, 2014/02/28 02:06:32]

Just straight up doing this seems like it could break stuff. The return value of
CheckCallAndFilter just switched from False to True for successful runs. There's
probably some code somewhere that says "if CheckCallAndFilterfoo)...". It should
only return output if given a special flag or something.

[Ryan Tseng, 2014/02/28 02:22:50]

If you check
https://code.google.com/p/chromium/codesearch#search/&q=CheckCallAndFilter&sq...
and
https://code.google.com/p/chromium/codesearch#search/&q=CheckCallAndFilterAnd...

No one actually uses the result of this function.

     if not retry:
       break
     print ("WARNING: subprocess '%s' in %s failed; will retry after a short "
            'nap...' % (' '.join('"%s"' % x for x in args), run_cwd))
     time.sleep(sleep_interval)
     sleep_interval *= 2
   raise subprocess2.CalledProcessError(
       rv, args, kwargs.get('cwd', None), None, None)
 
 
@@ skipping 456 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'))