Don't pass on --jobs to individual emerge processes in parallel_emerge.

parallel_emerge

 #!/usr/bin/python2.6
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Program to run emerge in parallel, for significant speedup.
 
 Usage:
  ./parallel_emerge [--board=BOARD] [--workon=PKGS] [--no-workon-deps]
                    [emerge args] package"
@@ skipping 1276 matching lines @@
     self._show_output = show_output
 
     if "--pretend" in emerge.opts:
       print "Skipping merge because of --pretend mode."
       sys.exit(0)
 
     # Setup scheduler graph object. This is used by the child processes
     # to help schedule jobs.
     emerge.scheduler_graph = emerge.depgraph.schedulerGraph()
 
+    # Calculate how many jobs we can run in parallel. We don't want to pass
+    # the --jobs flag over to emerge itself, because that'll tell emerge to
+    # hide its output, and said output is quite useful for debugging hung
+    # jobs.
     procs = min(self._total_jobs,
-                emerge.opts.get("--jobs", multiprocessing.cpu_count()))
+                emerge.opts.pop("--jobs", multiprocessing.cpu_count()))
     self._emerge_queue = multiprocessing.Queue()
     self._job_queue = multiprocessing.Queue()
     self._print_queue = multiprocessing.Queue()
     args = (self._emerge_queue, self._job_queue, emerge, package_db)
     self._pool = multiprocessing.Pool(procs, EmergeWorker, args)
     self._print_worker = multiprocessing.Process(target=PrintWorker,
                                                  args=[self._print_queue])
     self._print_worker.start()
 
     # Initialize the failed queue to empty.
@@ skipping 241 matching lines @@
       world_set.update(new_world_pkgs)
 
   # Update environment (library cache, symlinks, etc.)
   if deps.board and "--pretend" not in emerge.opts:
     portage.env_update()
 
   print "Done"
 
 if __name__ == "__main__":
   main()