devserver: introduce --datadir option to override where devserver puts static

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 103 matching lines @@
   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('--datadir', dest='datadir',

[sosa, 2011/02/11 23:59:20]

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.')
   parser.add_option('--image', dest='image',
                     help='Force update using this image.')
   parser.add_option('-p', '--pregenerate_update', action='store_true',
@@ skipping 19 matching lines @@
 
   devserver_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
   root_dir = os.path.realpath('%s/../..' % devserver_dir)
   serve_only = False
 
   if options.archive_dir:
     static_dir = os.path.realpath(options.archive_dir)
     _PrepareToServeUpdatesOnly(static_dir)
     serve_only = True
   else:
-    static_dir = os.path.realpath('%s/static' % devserver_dir)
+    static_dir = os.path.realpath('%s/static' % options.datadir)
     os.system('mkdir -p %s' % static_dir)
 
   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,
                      'DEVSERVER')
         sys.exit(1)
 
     else:
       # Clear all but the last N cached updates
       cmd = ('cd %s; ls -tr | head --lines=-%d | xargs rm -rf' %
              (cache_dir, CACHED_ENTRIES))
       if os.system(cmd) != 0:
         cherrypy.log('Failed to clean up old delta cache files with %s' % cmd,
                      'DEVSERVER')
         sys.exit(1)
   else:
     os.makedirs(cache_dir)
 
+  cherrypy.log('Data dir is %s' % options.datadir, 'DEVSERVER')

[sosa, 2011/02/11 23:59:20]

This is already logged when we print out the static dir

   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,
@@ skipping 17 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))