Correctly parse old ImageInfo command line arguments.
Parsing of source image_info command line arguments was incorrectly
hidden behind a short circuit boolean expression. This prevented
them from ever being present.
BUG=chromium:258634
TEST=cros_generate_paylaod <...> && paycheck -D
Change-Id: Ieb22f2056cf8e30edb4ae2c990301b6f30ed2403
Reviewed-on: https://chromium-review.googlesource.com/174582
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
diff --git a/generate_delta_main.cc b/generate_delta_main.cc
index d7de1ab..ede8ab9 100644
--- a/generate_delta_main.cc
+++ b/generate_delta_main.cc
@@ -332,7 +332,7 @@
ImageInfo old_image_info;
ImageInfo new_image_info;
- // TODO(dgarrett) Check the result is True when these args are required.
+ // Ignore failures. These are optional arguments.
ParseImageInfo(FLAGS_new_channel,
FLAGS_new_board,
FLAGS_new_version,
@@ -341,14 +341,14 @@
FLAGS_new_build_version,
&new_image_info);
- CHECK(is_delta || !ParseImageInfo(FLAGS_old_channel,
- FLAGS_old_board,
- FLAGS_old_version,
- FLAGS_old_key,
- FLAGS_old_build_channel,
- FLAGS_old_build_version,
- &old_image_info));
-
+ // Ignore failures. These are optional arguments.
+ ParseImageInfo(FLAGS_old_channel,
+ FLAGS_old_board,
+ FLAGS_old_version,
+ FLAGS_old_key,
+ FLAGS_old_build_channel,
+ FLAGS_old_build_version,
+ &old_image_info);
if (is_delta) {
LOG(INFO) << "Generating delta update";