commit 9fe740cb9ab0a14c16fa0c8cdb67ffe1aa1f7811
author Michael Mortensen <mmortensen@google.com> Tue Oct 29 14:42:48 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Oct 30 21:21:34 2019 +0000
tree e2abe465c9c75766db9b6d1ad601ef569a28d96d
parent 5533635f790e84f54f5760295cdad84ae6860065

Add additional error handling in determine_chrome_version.

BUG=chromium:1017583
TEST=manual, run_tests

Change-Id: I9010fdc4ba42465902f453722440f78879bcbb74
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1888631
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Reviewed-by: David Burger <dburger@chromium.org>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index 62d51f7..cfb09ee 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -133,7 +133,9 @@
 def GetChromeVersion(input_proto, output_proto, _config):
   """Returns the chrome version."""
   build_target = controller_util.ParseBuildTarget(input_proto.build_target)
-  output_proto.version = packages.determine_chrome_version(build_target)
+  chrome_version = packages.determine_chrome_version(build_target)
+  if chrome_version:
+    output_proto.version = chrome_version
 
 
 def _GetTargetVersionsResponse(_input_proto, output_proto, _config):
@@ -163,10 +165,13 @@
   android_target_version = packages.determine_android_target(build_target)
   if android_target_version:
     output_proto.android_target_version = android_target_version
+  # TODO(crbug/1019770): Investigate cases where builds_chrome is true but
+  # chrome_version is None.
   builds_chrome = packages.builds(constants.CHROME_CP, build_target)
   if builds_chrome:
-    output_proto.chrome_version = packages.determine_chrome_version(
-        build_target)
+    chrome_version = packages.determine_chrome_version(build_target)
+    if chrome_version:
+      output_proto.chrome_version = chrome_version
   output_proto.platform_version = packages.determine_platform_version()
   output_proto.milestone_version = packages.determine_milestone_version()
   output_proto.full_version = packages.determine_full_version()