commit 7bd88b1fe4173984a5f088c92172b2942f180c58
author Alex Klein <saklein@chromium.org> Fri May 19 15:39:55 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 22 17:49:01 2023 +0000
tree cdd6b067677c7a205731332c7a944eef0fd21bfb
parent 9fba8d05676e1943001a9889ec6751c533d63a99

scripts & service: Simple SplitCPV removals.

Very simple & contained SplitCPV usages converted to parse and
the resulting CPV/PackageInfo swaps.

BUG=b:187792048
TEST=./run_tests

Change-Id: I5c44b802abadf712d45095bbd49771010ad95fc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4550097
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_extract_deps.py

diff --git a/scripts/cros_extract_deps.py b/scripts/cros_extract_deps.py
index 2cc33c9..42690e1 100644
--- a/scripts/cros_extract_deps.py
+++ b/scripts/cros_extract_deps.py
@@ -73,13 +73,13 @@
         pkgtable = {}
     for cpv, record in deptree.items():
         if cpv not in pkgtable:
-            split = package_info.SplitCPV(cpv)
+            pkg_info = package_info.parse(cpv)
             pkgtable[cpv] = {
                 "deps": [],
                 "rev_deps": [],
-                "name": split.package,
-                "category": split.category,
-                "version": "%s" % split.version,
+                "name": pkg_info.package,
+                "category": pkg_info.category,
+                "version": pkg_info.vr,
                 "full_name": cpv,
                 "cpes": [],
                 "action": record["action"],
@@ -87,7 +87,7 @@
             if get_cpe:
                 pkgtable[cpv]["cpes"].extend(
                     GetCPEFromCPV(
-                        split.category, split.package, split.version_no_rev
+                        pkg_info.category, pkg_info.package, pkg_info.version
                     )
                 )