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>
diff --git a/scripts/has_prebuilt.py b/scripts/has_prebuilt.py
index f96c5fc..0e83097 100644
--- a/scripts/has_prebuilt.py
+++ b/scripts/has_prebuilt.py
@@ -18,6 +18,7 @@
from chromite.lib import cros_build_lib
from chromite.lib import osutils
from chromite.lib import portage_util
+from chromite.lib.parser import package_info
if cros_build_lib.IsInsideChroot():
from chromite.lib import depgraph
@@ -56,8 +57,8 @@
# Manually parse the packages as CPVs.
packages = []
for pkg in opts.packages:
- cpv = portage_util.SplitCPV(pkg, strict=False)
- if not cpv.category or not cpv.package:
+ cpv = package_info.parse(pkg)
+ if not cpv.atom:
parser.error('Invalid package atom: %s' % pkg)
packages.append(cpv)
@@ -74,7 +75,7 @@
board = opts.build_target_name
bests = {}
for cpv in opts.packages:
- bests[cpv.cp] = portage_util.PortageqBestVisible(cpv.cp, board=board)
+ bests[cpv.atom] = portage_util.PortageqBestVisible(cpv.atom, board=board)
# Emerge args:
# g: use binpkgs (needed to find if we have one)