commit 34afcbc5779579c77b4c6163f2ab42897de1ebd0
author Alex Klein <saklein@chromium.org> Thu Aug 22 16:14:31 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Aug 23 18:28:59 2019 +0000
tree 16a6ab3fb22d815b1a55fe5a8080e5500a5bf451
parent b408a71b6999f83f2d4e2b223fb6824696fa8d4e

UprevVersionedPackage: Add new version to output.

BUG=chromium:996890
TEST=run_tests

Change-Id: Ifd4ea7cdc8ff1187b294ccd07d4b7caa92427b32
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1766666
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index 6fa9410..3f9a902 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -63,13 +63,18 @@
     refs.append(GitRef(path=ref.repository, ref=ref.ref, revision=ref.revision))
 
   try:
-    uprevved = packages.uprev_versioned_package(package, build_targets, refs,
-                                                chroot)
+    result = packages.uprev_versioned_package(package, build_targets, refs,
+                                              chroot)
   except packages.Error as e:
     # Handle module errors nicely, let everything else bubble up.
     cros_build_lib.Die(e.message)
 
-  for path in uprevved:
+  if not result.uprevved:
+    # No uprevs executed, skip the output population.
+    return
+
+  output_proto.version = result.new_version
+  for path in result.modified_ebuilds:
     output_proto.modified_ebuilds.add().path = path