Merge remote branch 'cros/upstream' into master

server/autoserv

 #!/usr/bin/python -u
 # Copyright 2007-2008 Martin J. Bligh <mbligh@google.com>, Google Inc.
 # Released under the GPL v2
 
 """
 Run an control file through the server side engine
 """
 
 import sys, os, re, traceback, signal, time, logging, getpass
 
@@ skipping 71 matching lines @@
         execution_tag = parse_job
     host_protection = parser.options.host_protection
     ssh_user = parser.options.ssh_user
     ssh_port = parser.options.ssh_port
     ssh_pass = parser.options.ssh_pass
     collect_crashinfo = parser.options.collect_crashinfo
     control_filename = parser.options.control_filename
 
     # can't be both a client and a server side test
     if client and server:
-        print "Can not specify a test as both server and client!"
-        sys.exit(1)
+        parser.parser.error("Can not specify a test as both server and client!")
 
     if len(parser.args) < 1 and not (verify or repair or cleanup
                                      or collect_crashinfo):
-        print parser.parser.print_help()
-        sys.exit(1)
+        parser.parser.error("Missing argument: control file")
 
     # We have a control file unless it's just a verify/repair/cleanup job
     if len(parser.args) > 0:
         control = parser.args[0]
     else:
         control = None
 
     if machines_file:
         machines = []
         for m in open(machines_file, 'r').readlines():
             # remove comments, spaces
             m = re.sub('#.*', '', m).strip()
             if m:
                 machines.append(m)
         print "Read list of machines from file: %s" % machines_file
         print ','.join(machines)
 
     if machines:
         for machine in machines:
             if not machine or re.search('\s', machine):
-                print "Invalid machine %s" % str(machine)
-                sys.exit(1)
+                parser.parser.error("Invalid machine: %s" % str(machine))
         machines = list(set(machines))
         machines.sort()
 
     if group_name and len(machines) < 2:
-        print ("-G %r may only be supplied with more than one machine."
+        parser.parser.error("-G %r may only be supplied with more than one machine."
                % group_name)
-        sys.exit(1)
 
     kwargs = {'group_name': group_name, 'tag': execution_tag}
     if control_filename:
         kwargs['control_filename'] = control_filename
     job = server_job.server_job(control, parser.args[1:], results, label,
                                 user, machines, client, parse_job,
                                 ssh_user, ssh_port, ssh_pass, **kwargs)
     job.logging.start_logging()
     job.init_parser()
 
@@ skipping 94 matching lines @@
             # an 'abort' and return 1.
             exit_code = 1
     finally:
         if pid_file_manager:
             pid_file_manager.close_file(exit_code)
     sys.exit(exit_code)
 
 
 if __name__ == '__main__':
     main()