Fix --payload for optional stateful.tgz.

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 511 matching lines @@
   def GenerateUpdatePayloadForNonFactory(self, board_id, client_version,
                                          static_image_dir):
     """Generates an update for non-factory image.
 
        Returns:
          file name relative to static_image_dir on success.
     """
     if self.forced_payload:
       # If the forced payload is not already in our static_image_dir,
       # copy it there.
-      if (os.path.dirname(os.path.abspath(self.forced_payload)) !=
-          os.path.abspath(static_image_dir)):
-        self._Copy(self.forced_payload, os.path.join(static_image_dir,
-                                                     UPDATE_FILE))
+      src_path = os.path.abspath(self.forced_payload)
+      dest_path = os.path.join(static_image_dir, UPDATE_FILE)
 
-        self._Copy(os.path.join(os.path.dirname(self.forced_payload),
-                                STATEFUL_FILE),
-                   os.path.join(static_image_dir,
-                                STATEFUL_FILE))
+      src_stateful = os.path.join(os.path.dirname(src_path),
+                                  STATEFUL_FILE)
+      dest_stateful = os.path.join(static_image_dir,
+                                   STATEFUL_FILE)
+
+      # If the files are already in the destination dir, don't copy them.
+      if os.path.dirname(src_path) != os.path.abspath(static_image_dir):

[sosa, 2010/11/23 00:49:42]

The comment here is somewhat misleading.  Can you change it to match the diff
logic

[dgarrett, 2010/11/23 01:30:27]

Done.

+        self._Copy(src_path, dest_path)
+
+        # The stateful payload is optional.
+        if os.path.exists(src_stateful):

[sosa, 2010/11/23 00:49:42]

I'm not really sure this should be optional.  Maybe at least print a warning
that it can't find it.

[dgarrett, 2010/11/23 01:30:27]

It's normal for it to be missing for some workflows. For example, in the
document "How to build and push an update locally".

On 2010/11/23 00:49:42, sosa wrote:

[sosa, 2010/11/23 01:51:11]

It should always be there for an image that is a Developer or Test image.  It's
not necessary for non-dev/test images but these are rare except as release
images.

On 2010/11/23 01:30:27, dgarrett wrote:

[dgarrett, 2010/11/23 02:16:40]

Done.

+          self._Copy(src_stateful, dest_stateful)
+        else:
+          # If the source doesn't exist, don't leave an outdated stateful
+          # file around.
+          if os.path.exists(dest_stateful):
+            os.remove(dest_stateful)
 
       return UPDATE_FILE
     elif self.forced_image:
       return self.GenerateUpdateImageWithCache(
           self.forced_image,
           static_image_dir=static_image_dir)
     elif self.serve_only:
       return self.GenerateImageFromZip(static_image_dir)
     else:
       if board_id:
@@ skipping 86 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()