commit e73f278c09bcc7b43da7b51dda077bd474753fa1
author George Engelbrecht <engeg@google.com> Wed Jun 10 14:10:46 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Jun 11 03:32:55 2020 +0000
tree 5858d39821605d41774982e206c9dbc756a1b567
parent d096081a417fc58850fb8aa33bb2c24dbee0fc48

packages: remove manifest from virglrenderer uprev

PUpr generator does not find the file, and this package
is a local repository that is pinned to a commit instead
of fetched.

BUG=chromium:1066424
TEST=./run_tests.py

Change-Id: I65862ace69444f1dbaa9b7725020a1b3f4d863fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2240235
Reviewed-by: Navil Perez <navil@google.com>
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: George Engelbrecht <engeg@google.com>
Tested-by: George Engelbrecht <engeg@google.com>

service/packages.py

diff --git a/service/packages.py b/service/packages.py
index 39d8523..393d224 100644
--- a/service/packages.py
+++ b/service/packages.py
@@ -298,12 +298,11 @@
   Returns:
     UprevVersionedPackageResult: The result of updating virglrenderer ebuilds.
   """
-  repo_path = os.path.join(constants.SOURCE_ROOT, 'src', 'third_party',
-                           'virglrenderer')
-  manifest_path = os.path.join(constants.SOURCE_ROOT, repo_path, 'Manifest')
-  manifest = git.ManifestCheckout.Cached(manifest_path)
   overlay = os.path.join(constants.SOURCE_ROOT,
                          constants.CHROMIUMOS_OVERLAY_DIR)
+  repo_path = os.path.join(constants.SOURCE_ROOT, 'src', 'third_party',
+                           'virglrenderer')
+  manifest = git.ManifestCheckout.Cached(repo_path)
 
   uprev_manager = uprev_lib.UprevOverlayManager([overlay], manifest)
   # TODO(crbug.com/1066242): Ebuilds for virglrenderer are currently
@@ -311,7 +310,7 @@
   # longer blacklisted.
   uprev_manager.uprev(package_list=['media-libs/virglrenderer'], force=True)
 
-  updated_files = uprev_manager.modified_ebuilds + [manifest_path]
+  updated_files = uprev_manager.modified_ebuilds
   result = UprevVersionedPackageResult()
   result.add_result(refs[0].revision, updated_files)
   return result