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>

cli/deploy.py

diff --git a/cli/deploy.py b/cli/deploy.py
index f981c90..74b8d6f 100644
--- a/cli/deploy.py
+++ b/cli/deploy.py
@@ -23,12 +23,14 @@
 from chromite.cli import command
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
+from chromite.lib import dlc_lib
 from chromite.lib import operation
 from chromite.lib import osutils
 from chromite.lib import portage_util
 from chromite.lib import remote_access
-from chromite.lib import dlc_lib
 from chromite.lib import workon_helper
+from chromite.lib.parser import package_info
+
 try:
   import portage
 except ImportError:
@@ -161,7 +163,7 @@
   @staticmethod
   def _GetCP(cpv):
     """Returns the CP value for a given CPV string."""
-    attrs = portage_util.SplitCPV(cpv, strict=False)
+    attrs = package_info.SplitCPV(cpv, strict=False)
     if not attrs.cp:
       raise ValueError('Cannot get CP value for %s' % cpv)
     return attrs.cp
@@ -456,7 +458,7 @@
       A list of (CPV, slot) pairs of packages in the binpkgs database that
       match the pattern.
     """
-    attrs = portage_util.SplitCPV(cpv_pattern, strict=False)
+    attrs = package_info.SplitCPV(cpv_pattern, strict=False)
     cp_pattern = os.path.join(attrs.category or '*', attrs.package or '*')
     matches = []
     for cp, cp_slots in self.binpkgs_db.items():
@@ -530,8 +532,8 @@
     target_pkg_info = self.target_db.get(cp, dict()).get(slot)
     if target_pkg_info is not None:
       if cpv != target_pkg_info.cpv:
-        attrs = portage_util.SplitCPV(cpv)
-        target_attrs = portage_util.SplitCPV(target_pkg_info.cpv)
+        attrs = package_info.SplitCPV(cpv)
+        target_attrs = package_info.SplitCPV(target_pkg_info.cpv)
         logging.debug('Updating %s: version (%s) different on target (%s)',
                       cp, attrs.version, target_attrs.version)
         return True, True
@@ -869,7 +871,7 @@
   """Returns paths to binary packages corresponding to |cpvs|.
 
   Args:
-    cpvs: List of CPV components given by portage_util.SplitCPV().
+    cpvs: List of CPV components given by package_info.SplitCPV().
     strip: True to run strip_package.
     sysroot: Sysroot path.
 
@@ -914,7 +916,7 @@
   Returns:
     List of paths corresponding to |pkgs|.
   """
-  cpvs = [portage_util.SplitCPV(p) for p in pkgs]
+  cpvs = [package_info.SplitCPV(p) for p in pkgs]
   return _GetPackagesByCPV(cpvs, strip, sysroot)
 
 
@@ -1187,7 +1189,7 @@
       # Warn when the user seems to forget `cros workon start`.
       worked_on_cps = workon_helper.WorkonHelper(sysroot).ListAtoms()
       for package in listed:
-        cp = portage_util.SplitCPV(package).cp
+        cp = package_info.SplitCPV(package).cp
         if cp not in worked_on_cps:
           logging.warning(
               'Are you intentionally deploying unmodified packages, or did '