Print diagnosis message when a task is Ctrl-C'ed out

gclient_utils.py

 # Copyright (c) 2011 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 errno
 import logging
 import os
 import Queue
@@ skipping 325 matching lines @@
       args, bufsize=0, stdout=subprocess2.PIPE, stderr=subprocess2.STDOUT,
       **kwargs)
 
   # 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.
-  in_byte = kid.stdout.read(1)
-  if in_byte:
-    if call_filter_on_first_line:
-      filter_fn(None)
-    in_line = ''
-    while 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 = ''
-      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()
+  try:
+    in_byte = kid.stdout.read(1)
+    if in_byte:
+      if call_filter_on_first_line:
+        filter_fn(None)
+      in_line = ''
+      while 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 = ''
+        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()
+  except KeyboardInterrupt:
+    print >> sys.stderr, 'Failed while running "%s"' % ' '.join(args)
+    raise
+
   if rv:
     raise subprocess2.CalledProcessError(
         rv, args, kwargs.get('cwd', None), None, None)
   return 0
 
 
 def FindGclientRoot(from_dir, filename='.gclient'):
   """Tries to find the gclient root."""
   real_from_dir = os.path.realpath(from_dir)
   path = real_from_dir
@@ skipping 254 matching lines @@
         logging.info('Caught exception in thread %s' % self.item.name)
         logging.info(str(sys.exc_info()))
         work_queue.exceptions.put(sys.exc_info())
       logging.info('Task %s done' % self.item.name)
 
       work_queue.ready_cond.acquire()
       try:
         work_queue.ready_cond.notifyAll()
       finally:
         work_queue.ready_cond.release()