Modify devserver and gmerge to be friendlier

devserver.py

 #!/usr/bin/python
 
 # Copyright (c) 2009-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.
 
 """A CherryPy-based webserver to host images and build packages."""
 
 import cherrypy
 import optparse
 import os
+import subprocess
 import sys
 
 import autoupdate
+import builder
 
 CACHED_ENTRIES=12
 
 # Sets up global to share between classes.
 global updater
 updater = None
 
 def _GetConfig(options):
   """Returns the configuration for the devserver."""
   base_config = { 'global':
@@ skipping 37 matching lines @@
     if image_dir != os.readlink('static/archive'):
       cherrypy.log('removing stale symlink to %s' % image_dir, 'DEVSERVER')
       os.unlink('static/archive')
       os.symlink(image_dir, 'static/archive')
   else:
     os.symlink(image_dir, 'static/archive')
   cherrypy.log('archive dir: %s ready to be used to serve images.' % image_dir,
                'DEVSERVER')
 
 
-class DevServerRoot:
+class DevServerRoot(object):
   """The Root Class for the Dev Server.
 
   CherryPy works as follows:
     For each method in this class, cherrpy interprets root/path
     as a call to an instance of DevServerRoot->method_name.  For example,
     a call to http://myhost/build will call build.  CherryPy automatically
     parses http args and places them as keyword arguments in each method.
     For paths http://myhost/update/dir1/dir2, you can use *args so that
     cherrypy uses the update method and puts the extra paths in args.
   """
 
-  def build(self, board, pkg):
+  def __init__(self):
+    self._builder = builder.Builder()
+
+  def build(self, board, pkg, **kwargs):
     """Builds the package specified."""
-    cherrypy.log('emerging %s' % pkg, 'BUILD')
-    emerge_command = 'emerge-%s %s' % (board, pkg)
-    err = os.system(emerge_command)
-    if err != 0:
-      raise Exception('failed to execute %s' % emerge_command)
-    eclean_command = 'eclean-%s -d packages' % board
-    err = os.system(eclean_command)
-    if err != 0:
-      raise Exception('failed to execute %s' % emerge_command)
+    return self._builder.Build(board, pkg, kwargs)
 
   def index(self):
     return 'Welcome to the Dev Server!'
 
   def update(self, *args):
     label = '/'.join(args)
     body_length = int(cherrypy.request.headers['Content-Length'])
     data = cherrypy.request.rfile.read(body_length)
     return updater.HandleUpdatePing(data, label)
 
@@ skipping 103 matching lines @@
     # We don't run the dev server with this option.
     if options.validate_factory_config:
       sys.exit(0)
   elif options.pregenerate_update:
     if not updater.PreGenerateUpdate():
       sys.exit(1)
 
   # If the command line requested after setup, it's time to do it.
   if not options.exit:
     cherrypy.quickstart(DevServerRoot(), config=_GetConfig(options))