Add ability to pass a private_key when generating a payload.

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 45 matching lines @@
 
 
 def _PrepareToServeUpdatesOnly(image_dir):
   """Sets up symlink to image_dir for serving purposes."""
   assert os.path.exists(image_dir), '%s must exist.' % image_dir
   # If  we're  serving  out  of  an archived  build  dir  (e.g.  a
   # buildbot), prepare this webserver's magic 'static/' dir with a
   # link to the build archive.
   cherrypy.log('Preparing autoupdate for "serve updates only" mode.',
                'DEVSERVER')
-  if os.path.exists('static/archive'):
+  if os.path.lexists('static/archive'):
     if image_dir != os.readlink('static/archive'):
       cherrypy.log('removing stale symlink to %s' % image_dir, 'DEVSERVER')
       os.unlink('static/archive')
       os.symlink(image_dir, 'static/archive')
   else:
     os.symlink(image_dir, 'static/archive')
   cherrypy.log('archive dir: %s ready to be used to serve images.' % image_dir,
                'DEVSERVER')
 
 
@@ skipping 51 matching lines @@
   parser.add_option('--for_vm', dest='vm', default=False, action='store_true',
                     help='Update is for a vm image.')
   parser.add_option('--image', dest='image',
                     help='Force update using this image.')
   parser.add_option('-p', '--pregenerate_update', action='store_true',
                     default=False, help='Pre-generate update payload.')
   parser.add_option('--payload', dest='payload',
                     help='Use update payload from specified directory.')
   parser.add_option('--port', default=8080,
                     help='Port for the dev server to use.')
+  parser.add_option('--private_key', default=None,
+                    help='Path to the private key in pem format.')
   parser.add_option('--production', action='store_true', default=False,
                     help='Have the devserver use production values.')
   parser.add_option('--proxy_port', default=None,
                     help='Port to have the client connect to (testing support)')
   parser.add_option('--src_image', default='',
                     help='Image on remote machine for generating delta update.')
   parser.add_option('-t', action='store_true', dest='test_image')
   parser.add_option('-u', '--urlbase', dest='urlbase',
                     help='base URL, other than devserver, for update images.')
   parser.add_option('--validate_factory_config', action="store_true",
@@ skipping 47 matching lines @@
       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)
+      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))