commit 18a60afa41f69297e448e475dc0f2a06cb847d4b
author Alex Klein <saklein@chromium.org> Thu Jun 11 12:08:47 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Sep 22 17:03:44 2020 +0000
tree c9627d2a28d27600f032f6d2f4377de9d11d3c0f
parent ecea5b57d9dc83641a1ccf72a8e267b2633b45a3

portage_util.SplitCPV: convert usages to new parser lib.

BUG=chromium:1077379
TEST=run_pytest

Change-Id: Icab78423deef2917ac6dd6e1428c2b993b4176c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2241585
Tested-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>

api/controller/dependency.py

diff --git a/api/controller/dependency.py b/api/controller/dependency.py
index 338cfac..0605085 100644
--- a/api/controller/dependency.py
+++ b/api/controller/dependency.py
@@ -20,7 +20,7 @@
 from chromite.api.gen.chromite.api import depgraph_pb2
 # TODO(crbug/1081828): stop using build_target and drop it from the proto.
 from chromite.lib import cros_build_lib
-from chromite.lib import portage_util
+from chromite.lib.parser import package_info
 from chromite.service import dependency
 
 
@@ -43,20 +43,21 @@
 
   for data in json_map['package_deps'].values():
     package_dep_info = graph.package_deps.add()
-    package_info = package_dep_info.package_info
-    package_info.package_name = data['name']
-    package_info.category = data['category']
-    package_info.version = data['version']
+    package_info_msg = package_dep_info.package_info
+    package_info_msg.package_name = data['name']
+    package_info_msg.category = data['category']
+    package_info_msg.version = data['version']
     for dep in data['deps']:
-      cpv = portage_util.SplitCPV(dep, strict=False)
+      cpv = package_info.SplitCPV(dep, strict=False)
       dep_package = package_dep_info.dependency_packages.add()
       dep_package.package_name = cpv.package
       dep_package.category = cpv.category
       if cpv.version:
         dep_package.version = cpv.version
 
-    package_CPV = '%s/%s-%s' % (package_info.category,
-                                package_info.package_name, package_info.version)
+    package_CPV = '%s/%s-%s' % (package_info_msg.category,
+                                package_info_msg.package_name,
+                                package_info_msg.version)
     for path in json_map['source_path_mapping'][package_CPV]:
       source_path = package_dep_info.dependency_source_paths.add()
       source_path.path = path
@@ -129,9 +130,9 @@
       src_paths=src_paths,
       packages=packages)
   for package in package_deps:
-    package_info = output_proto.package_deps.add()
-    cpv = portage_util.SplitCPV(package, strict=False)
-    controller_util.CPVToPackageInfo(cpv, package_info)
+    pkg_info = output_proto.package_deps.add()
+    cpv = package_info.SplitCPV(package, strict=False)
+    controller_util.CPVToPackageInfo(cpv, pkg_info)
 
 
 def _DummyGetToolchainPathsResponse(_input_proto, output_proto, _config):