Symlink update and stateful payloads for all image flags.
We introduced a bug in a previous CL where we stopped symlinking stateful
and update payloads when determing which payload to use.
BUG=chromium:279621
TEST=image_to_live with --image / --payload
Change-Id: Ib737b65392d1ad5250185337037650fc8af313f9
Reviewed-on: https://chromium-review.googlesource.com/167146
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>
diff --git a/autoupdate.py b/autoupdate.py
index 1ca2307..6bb2d06 100644
--- a/autoupdate.py
+++ b/autoupdate.py
@@ -661,13 +661,13 @@
# Make sure the xbuddy path target is in the directory.
path_to_payload, _image_name = self.xbuddy.Get(xbuddy_label.split('/'))
# Pretend to have called update with this update path to payload.
- return self.GetPathToPayload(xbuddy_label, client_version, board)
-
- src_path = os.path.abspath(self.forced_image)
- if os.path.exists(src_path) and common_util.IsInsideChroot():
- # Image was found for the given label. Generate update if we can.
- return self.GenerateUpdateImageWithCache(
- src_path, static_image_dir=self.static_dir)
+ self.GetPathToPayload(xbuddy_label, client_version, board)
+ else:
+ src_path = os.path.abspath(self.forced_image)
+ if os.path.exists(src_path) and common_util.IsInsideChroot():
+ # Image was found for the given label. Generate update if we can.
+ path_to_payload = self.GenerateUpdateImageWithCache(
+ src_path, static_image_dir=self.static_dir)
else:
label = label or ''
label_list = label.split('/')