Plumb in subcommand options

shell/subcmds/build_cmd.py

 # Copyright (c) 2011 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.
 
 """Implementation of the 'build' chromite command."""
 
 # Python imports
 import optparse
 import os
 
@@ skipping 46 matching lines @@
     clean_first: Delete any old board config first.
   """
   # Skip this whole command if things already exist.
   board_dir = utils.GetBoardDir(build_config)
   if (not clean_first) and os.path.isdir(board_dir):
     cros_env.GetOperation().Info('%s already exists, skipping setup_board.' %
         board_dir)
     return
 
   # Put together command.
-  cmd_list = [
+  arg_list = [
       '--board="%s"' % build_config.get('DEFAULT', 'target'),
       build_config.get('BUILD', 'setup_board_flags'),
   ]
   if clean_first:
     arg_list.insert(0, '--force')
 
   cros_env.RunScript('SETTING UP THE BOARD', './setup_board', arg_list)
 
 
 def _DoBuildPackages(cros_env, build_config):
@@ skipping 71 matching lines @@
       loaded_config: If True, we've already loaded the config.
       build_config: None when called normally, but contains the SafeConfigParser
           for the build config if we call ourselves with _DoEnterChroot().  Note
           that even when called through _DoEnterChroot(), could still be None
           if user chose 'HOST' as the target.
     """
     # Parse options for command...
     usage_str = ('usage: %%prog [chromite_options] %s [options] [target]' %
                  raw_argv[0])
     parser = optparse.OptionParser(usage=usage_str)
-    # This option won't work until a later CL plumbs in optparse
-    #parser.add_option('--clean', default=False, action='store_true',
-                      #help='Clean before building.')
+    parser.add_option('--clean', default=False, action='store_true',
+                      help='Clean before building.')
     (options, argv) = parser.parse_args(raw_argv[1:])
-    options.clean = False
 
     # Load the build config if needed...
     if not loaded_config:
       argv, build_config = utils.GetBuildConfigFromArgs(argv)
       if argv:
         cros_lib.Die('Unknown arguments: %s' % ' '.join(argv))
 
     if not cros_lib.IsInsideChroot():
       # Note: we only want to clean the chroot if they do --clean and have the
       # host target.  If they do --clean and have a board target, it means
       # that they just want to clean the board...
       want_clean_chroot = options.clean and build_config is None
 
       _DoMakeChroot(self.cros_env, chroot_config, want_clean_chroot)
 
       if build_config is not None:
         self._oper.Info('ENTERING THE CHROOT')
         utils.EnterChroot(chroot_config, (self, 'Run'), raw_argv,
                           build_config=build_config, loaded_config=True)
 
       self._oper.Info('Done building.')
     else:
       if build_config is None:
         cros_lib.Die("You can't build the host chroot from within the chroot.")
 
       _DoSetupBoard(self.cros_env, build_config, options.clean)
       _DoBuildPackages(self.cros_env, build_config)
       _DoBuildImage(self.cros_env, build_config)
       _DoImagePostProcessing(self.cros_env, build_config)