Remove --client_prefix argument and check.

devserver.py

 #!/usr/bin/python
 
 # Copyright (c) 2009-2010 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.
 
 """A CherryPy-based webserver to host images and build packages."""
 
 import cherrypy
 import optparse
@@ skipping 100 matching lines @@
 
 if __name__ == '__main__':
   usage = 'usage: %prog [options]'
   parser = optparse.OptionParser(usage)
   parser.add_option('--archive_dir', dest='archive_dir',
                     help='serve archived builds only.')
   parser.add_option('--board', dest='board',
                     help='When pre-generating update, board for latest image.')
   parser.add_option('--clear_cache', action='store_true', default=False,
                     help='Clear out all cached udpates and exit')
-  parser.add_option('--client_prefix', dest='client_prefix',
-                    help='Required prefix for client software version.',
-                    default='MementoSoftwareUpdate')
+  parser.add_option('--client_prefix', dest='client_prefix_deprecated',

[sosa, 2011/03/15 20:33:49]

Maybe instead of in the help ... print out something later that prints out a fat
warning that says to change your script.

[Greg Spencer (Chromium), 2011/03/15 21:14:37]

OK, added this.

+                    help='No longer used.  It is still here so we don\'t break '
+                    'scripts that used it.', default='')
   parser.add_option('--data_dir', dest='data_dir',
                     help='Writable directory where static lives',
                     default=os.path.dirname(os.path.abspath(sys.argv[0])))
   parser.add_option('--exit', action='store_true', default=False,
                     help='Don\'t start the server (still pregenerate or clear'
                          'cache).')
   parser.add_option('--factory_config', dest='factory_config',
                     help='Config file for serving images from factory floor.')
   parser.add_option('--for_vm', dest='vm', default=False, action='store_true',
                     help='Update is for a vm image.')
@@ skipping 70 matching lines @@
   cherrypy.log('Source root is %s' % root_dir, 'DEVSERVER')
   cherrypy.log('Serving from %s' % static_dir, 'DEVSERVER')
 
   updater = autoupdate.Autoupdate(
       root_dir=root_dir,
       static_dir=static_dir,
       serve_only=serve_only,
       urlbase=options.urlbase,
       test_image=options.test_image,
       factory_config_path=options.factory_config,
-      client_prefix=options.client_prefix,
       forced_image=options.image,
       forced_payload=options.payload,
       port=options.port,
       proxy_port=options.proxy_port,
       src_image=options.src_image,
       vm=options.vm,
       board=options.board,
       copy_to_static_root=not options.exit,
       private_key=options.private_key,
   )
 
   # Sanity-check for use of validate_factory_config.
   if not options.factory_config and options.validate_factory_config:
     parser.error('You need a factory_config to validate.')
 
   if options.factory_config:
     updater.ImportFactoryConfigFile(options.factory_config,
                                      options.validate_factory_config)
     # We don't run the dev server with this option.
     if options.validate_factory_config:
       sys.exit(0)
   elif options.pregenerate_update:
     if not updater.PreGenerateUpdate():
       sys.exit(1)
 
   # If the command line requested after setup, it's time to do it.
   if not options.exit:
     cherrypy.quickstart(DevServerRoot(), config=_GetConfig(options))