devserver: in case archive_dir != static_dir, serve from archive_dir

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 157 matching lines @@
   #  archive_dir is the directory where static/archive will point.
   #  If this is an absolute path, all is fine. If someone calls this
   #  using a relative path, that is relative to src/platform/dev/.
   #  That use case is unmaintainable, but since applications use it
   #  with =./static, instead of a boolean flag, we'll make this relative
   #  to devserver_dir  to keep these unbroken. For now.
     archive_dir = options.archive_dir
     if not os.path.isabs(archive_dir):
       archive_dir = os.path.realpath(os.path.join(devserver_dir,archive_dir))
     _PrepareToServeUpdatesOnly(archive_dir, static_dir)
+    static_dir = os.path.realpath(archive_dir)
     serve_only = True
 
   cache_dir = os.path.join(static_dir, 'cache')
   cherrypy.log('Using cache directory %s' % cache_dir, 'DEVSERVER')
 
   if os.path.exists(cache_dir):
     if options.clear_cache:
       # Clear the cache and exit on error.
       if os.system('rm -rf %s/*' % cache_dir) != 0:
         cherrypy.log('Failed to clear the cache with %s' % cmd,
@@ skipping 44 matching lines @@
     # 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))