Fix devserver's handling of static images.

src/platform/dev/autoupdate.py

 # Copyright (c) 2009 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.
 
 from buildutil import BuildObject
 from xml.dom import minidom
 
 import os
 import shutil
 import web
 
 class Autoupdate(BuildObject):
   # Basic functionality of handling ChromeOS autoupdate pings
   # and building/serving update images.
   # TODO(rtc): Clean this code up and write some tests.
 
-  def __init__(self, serve_only=None, test_image=False, *args, **kwargs):
+  def __init__(self, serve_only=None, test_image=False, urlbase=None,
+               *args, **kwargs):
+    super(Autoupdate, self).__init__(*args, **kwargs)
     self.serve_only = serve_only
+    self.test_image=test_image
+    self.static_urlbase = urlbase
     if serve_only:
+      # 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.
       web.debug('Autoupdate in "serve update images only" mode.')
-    self.test_image=test_image
-    super(Autoupdate, self).__init__(*args, **kwargs)
+      if os.path.exists('static/archive'):
+        archive_symlink = os.readlink('static/archive')
+        if archive_symlink != self.static_dir:
+          web.debug('removing stale symlink to %s' % self.static_dir)
+          os.unlink('static/archive')
+      else:
+        os.symlink(self.static_dir, 'static/archive')
 
   def GetUpdatePayload(self, hash, size, url):
     payload = """<?xml version="1.0" encoding="UTF-8"?>
       <gupdate xmlns="http://www.google.com/update2/response" protocol="2.0">
         <app appid="{%s}" status="ok">
           <ping status="ok"/>
           <updatecheck
             codebase="%s"
             hash="%s"
             needsadmin="false"
@@ skipping 40 matching lines @@
       return int(latest_tokens[i]) > int(client_tokens[i])
     return False
 
   def UnpackRootfs(self, image_path, rootfs_file):
     if os.path.exists(rootfs_file):
       return True
     if self.test_image:
       image_file = 'chromiumos_test_image.bin'
     else:
       image_file = 'chromiumos_image.bin'
+    if self.serve_only:
+      os.system('cd %s && unzip -o image.zip unpack_partitions.sh %s' %
+                (image_path, image_file))
     os.system('rm -f %s/part_*' % image_path)
     os.system('cd %s && ./unpack_partitions.sh %s' % (image_path, image_file))
     shutil.move(os.path.join(image_path, 'part_3'), rootfs_file)
     os.system('rm -f %s/part_*' % image_path)
     return True
 
   def BuildUpdateImage(self, image_path):
     if self.test_image:
       image_file = '%s/rootfs_test.image' % image_path
     else:
       image_file = '%s/rootfs.image' % image_path
 
     if not self.UnpackRootfs(image_path, image_file):
       web.debug('failed to unpack rootfs.')
       return False
 
     update_file = '%s/update.gz' % image_path
     if (os.path.exists(update_file) and
         os.path.getmtime(update_file) >= os.path.getmtime(image_file)):
       web.debug('Found cached update image %s/update.gz' % image_path)
     else:
-      web.debug('generating update image %s/update.gz' % image_path)
+      web.debug('generating update image %s' % update_file)
       mkupdate = '%s/mk_memento_images.sh %s' % (self.scripts_dir, image_file)
       web.debug(mkupdate)
       err = os.system(mkupdate)
       if err != 0:
         web.debug('failed to create update image')
         return False
     if not self.serve_only:
       web.debug('Found an image, copying it to static')
       try:
-        shutil.copy('%s/update.gz' % image_path, self.static_dir)
+        shutil.copy(update_file, self.static_dir)
       except Exception, e:
-        web.debug('Unable to copy update.gz from %s to %s' \
-                  % (image_path, self.static_dir))
+        web.debug('Unable to copy %s to %s' % (update_file, self.static_dir))
         return False
     return True
 
   def GetSize(self, update_path):
     return os.path.getsize(update_path)
 
   def GetHash(self, update_path):
     cmd = "cat %s | openssl sha1 -binary | openssl base64 | tr \'\\n\' \' \';" \
         % update_path
     web.debug(cmd)
@@ skipping 22 matching lines @@
         web.debug('%s not found.' % image_path)
         return self.GetNoUpdatePayload()
       # Construct a response
       ok = self.BuildUpdateImage(image_path)
       if ok != True:
         web.debug('Failed to build an update image')
         return self.GetNoUpdatePayload()
       web.debug('serving update: ')
       hash = self.GetHash('%s/%s/update.gz' % (self.static_dir, label))
       size = self.GetSize('%s/%s/update.gz' % (self.static_dir, label))
-      url = 'http://%s/static/archive/%s/update.gz' % (hostname, label)
+      # In case we configured images to be hosted elsewhere
+      # (e.g. buildbot's httpd), use that. Otherwise, serve it
+      # ourselves using web.py's static resource handler.
+      if self.static_urlbase:
+        urlbase = self.static_urlbase
+      else:
+        urlbase = 'http://%s/static/archive/' % hostname
+
+      url = '%s/%s/update.gz' % (urlbase, label)
       return self.GetUpdatePayload(hash, size, url)
       web.debug( 'DONE')
     else:
       web.debug('update found %s ' % latest_version)
       ok = self.BuildUpdateImage(latest_image_path)
       if ok != True:
         web.debug('Failed to build an update image')
         return self.GetNoUpdatePayload()
 
       hash = self.GetHash('%s/update.gz' % self.static_dir)
       size = self.GetSize('%s/update.gz' % self.static_dir)
 
       url = 'http://%s/static/update.gz' % hostname
       return self.GetUpdatePayload(hash, size, url)