devserver: start using payload scripts bundled with devserver

autoupdate.py

 # 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.
 
 from buildutil import BuildObject
 from xml.dom import minidom
 
 import cherrypy
 import os
 import shutil
@@ skipping 225 matching lines @@
 
     Args:
       image_path: Full path to image.
     Returns:
       Path to created update_payload or None on error.
     """
     update_path = os.path.join(output_dir, UPDATE_FILE)
     _LogMessage('Generating update image %s' % update_path)
 
     update_command = [
-        '%s/cros_generate_update_payload' % self.scripts_dir,
+        '%s/cros_generate_update_payload' % self.devserver_dir,
         '--image="%s"' % image_path,
         '--output="%s"' % update_path,
         '--noold_style',
     ]
 
     if src_image: update_command.append('--src_image="%s"' % src_image)
     if not self.vm: update_command.append('--patch_kernel')
     if self.private_key: update_command.append('--private_key="%s"' %
                                                self.private_key)
 
@@ skipping 11 matching lines @@
     Args:
       image_path: Full path to image.
     Returns:
       Path to created stateful update_payload or None on error.
     Raises:
       A subprocess exception if the update generator fails to generate a
       stateful payload.
     """
     output_gz = os.path.join(output_dir, STATEFUL_FILE)
     subprocess.check_call(
-        ['%s/cros_generate_stateful_update_payload' % self.scripts_dir,
+        ['%s/cros_generate_stateful_update_payload' % self.devserver_dir,
          '--image=%s' % image_path,
          '--output_dir=%s' % output_dir,
         ])
     return STATEFUL_FILE
 
   def FindCachedUpdateImageSubDir(self, src_image, dest_image):
     """Find directory to store a cached update.
 
        Given one, or two images for an update, this finds which
        cache directory should hold the update files, even if they don't exist
@@ skipping 372 matching lines @@
         is_delta_format = self._IsDeltaFormatFile(filename)
         if label:
           url = '%s/%s/%s' % (static_urlbase, label, payload_path)
         else:
           url = '%s/%s' % (static_urlbase, payload_path)
 
         _LogMessage('Responding to client to use url %s to get image.' % url)
         return self.GetUpdatePayload(hash, sha256, size, url, is_delta_format)
       else:
         return self.GetNoUpdatePayload()