Merge remote branch 'cros/upstream' into master

server/autoserv_parser.py

 import os, sys, getopt, optparse
 
 from autotest_lib.client.common_lib import host_protections, utils
 
 
 class base_autoserv_parser(object):
     """Custom command-line options parser for autoserv.
 
     We can't use the general getopt methods here, as there will be unknown
     extra arguments that we pass down into the control file instead.
     Thus we process the arguments by hand, for which we are duly repentant.
     Making a single function here just makes it harder to read. Suck it up.
     """
     def __init__(self):
         self.args = sys.argv[1:]
-        self.parser = optparse.OptionParser()
+        self.parser = optparse.OptionParser(usage="%prog [options] [control-file]")
         self.setup_options()
 
         # parse an empty list of arguments in order to set self.options
         # to default values so that codepaths that assume they are always
         # reached from an autoserv process (when they actually are not)
         # will still work
         self.options, self.args = self.parser.parse_args(args=[])
 
 
     def setup_options(self):
@@ skipping 116 matching lines @@
 site_autoserv_parser = utils.import_site_class(
     __file__, "autotest_lib.server.site_autoserv_parser",
     "site_autoserv_parser", base_autoserv_parser)
 
 class autoserv_parser(site_autoserv_parser):
     pass
 
 
 # create the one and only one instance of autoserv_parser
 autoserv_parser = autoserv_parser()