Put common options in a group.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/wizard/command/_base.py b/wizard/command/_base.py
index d597f64c6d8e1facdd99de118a76fa0c52b7f27f..2ccdd710137e389d3000c8c92f42cb495d1e8598 100644 (file)
--- a/wizard/command/_base.py
+++ b/wizard/command/_base.py
@@ -103,20 +103,22 @@ class WizardOptionParser(optparse.OptionParser):
     def __init__(self, *args, **kwargs):
         optparse.OptionParser.__init__(self, *args, **kwargs)
     def parse_all(self, argv):
-        self.add_option("-v", "--verbose", dest="verbose", action="store_true",
+        group = optparse.OptionGroup(self, "Common Options")
+        group.add_option("-v", "--verbose", dest="verbose", action="store_true",
                 default=False, help="Turns on verbose output")
-        self.add_option("--debug", dest="debug", action="store_true",
+        group.add_option("--debug", dest="debug", action="store_true",
                 default=False, help="Turns on debugging output")
-        self.add_option("-q", "--quiet", dest="quiet", action="store_true",
+        group.add_option("-q", "--quiet", dest="quiet", action="store_true",
                 default=False, help="Turns off output to stdout")
-        self.add_option("--log-file", dest="log_file",
+        group.add_option("--log-file", dest="log_file",
                 default=None, help="Logs verbose output to file")
-        self.add_option("--log-file-chmod", dest="log_file_chmod",
+        group.add_option("--log-file-chmod", dest="log_file_chmod",
                 default=None, help="Chmod the log file after opening.  Number is octal. You must chmod the log file 666 and place the file in /tmp if subprocesses are running as different users.")
-        self.add_option("--indent", dest="indent",
+        group.add_option("--indent", dest="indent",
                 default=0, help="Indents stdout, useful for nested calls")
-        self.add_option("--context", dest="context", action="store_true",
+        group.add_option("--context", dest="context", action="store_true",
                 default=False, help="Adds context to logs, useful for parallel processing")
+        self.add_option_group(group)
         options, numeric_args = self.parse_args(argv)
         makeLogger(options, numeric_args)
         return options, numeric_args