Fix the case where a dep not processed could be set as a requirement.

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 436 matching lines @@
     return None
 
   env = {}
   execfile(config_path, env)
   config_dir = os.path.dirname(config_path)
   return config_dir, env['entries']
 
 
 class WorkItem(object):
   """One work item."""
-  # A list of string, each being a WorkItem name.
-  requirements = []
-  # A unique string representing this work item.
-  name = None
+  def __init__(self):
+    # A list of string, each being a WorkItem name.
+    self.requirements = []
+    # A unique string representing this work item.
+    self.name = None
 
   def run(self, work_queue):
     """work_queue is passed as keyword argument so it should be
     the last parameters of the function when you override it."""
     pass
 
 
 class ExecutionQueue(object):
   """Runs a set of WorkItem that have interdependencies and were WorkItem are
   added as they are processed.
@@ skipping 70 matching lines @@
               self._run_one_task(self.queued.pop(i), args, kwargs)
               break
           else:
             # Couldn't find an item that could run. Break out the outher loop.
             break
 
         if not self.queued and not self.running:
           # We're done.
           break
         # We need to poll here otherwise Ctrl-C isn't processed.
-        self.ready_cond.wait(10)
+        try:
+          self.ready_cond.wait(10)
+        except KeyboardInterrupt:
+          # Help debugging by printing some information:
+          print >> sys.stderr, (
+              ('\nAllowed parallel jobs: %d\n# queued: %d\nRan: %s\n'
+                'Running: %d') % (
+              self.jobs,
+              len(self.queued),
+              ', '.join(self.ran),
+              len(self.running)))
+          for i in self.queued:
+            print >> sys.stderr, '%s: %s' % (i.name, ', '.join(i.requirements))
+          raise
         # Something happened: self.enqueue() or a thread terminated. Loop again.
     finally:
       self.ready_cond.release()
 
     assert not self.running, 'Now guaranteed to be single-threaded'
     if not self.exceptions.empty():
       # To get back the stack location correctly, the raise a, b, c form must be
       # used, passing a tuple as the first argument doesn't work.
       e = self.exceptions.get()
       raise e[0], e[1], e[2]
@@ skipping 52 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()