Plumb in subcommand options

shell/subcmds/clean_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 'clean' chromite command."""
 
 # Python imports
 import optparse
 import os
 import sys
@@ skipping 96 matching lines @@
     Args:
       raw_argv: Command line arguments, including this command's name, but not
           the chromite command name or chromite options.
       chroot_config: A SafeConfigParser for the chroot config; or None chromite
           was called from within the chroot.
     """
     # 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('-y', '--yes', default=False, action='store_true',
-                      #help='Answer "YES" to "are you sure?" questions.')
+    parser.add_option('-y', '--yes', default=False, action='store_true',
+                      help='Answer "YES" to "are you sure?" questions.')
     (options, argv) = parser.parse_args(raw_argv[1:])
-    options.yes = False
 
     # Make sure the chroot exists first, before possibly prompting for board...
     # ...not really required, but nice for the user...
     if not cros_lib.IsInsideChroot():
       if not utils.DoesChrootExist(chroot_config):
         cros_lib.Die("Nothing to clean: the chroot doesn't exist.\n  %s" %
             utils.GetChrootAbsDir(chroot_config))
 
     # Load the build config...
     argv, build_config = utils.GetBuildConfigFromArgs(argv)
     if argv:
       cros_lib.Die('Unknown arguments: %s' % ' '.join(argv))
 
     # If they do clean host, we'll delete the whole chroot
     if build_config is None:
       _DoDistClean(self.cros_env, chroot_config, options.yes)
     else:
       _DoClean(self.cros_env, chroot_config, build_config, options.yes)