Merge ~emitorino/review-tools:fix_arch_qualifier_issue_for_rocks_manifest_parsing into review-tools:master

[Emilia Torino]

- store.py: properly parse arch qualifier if present on rock dpkg.query

This issue was fixed for snaps in this MP https://code.launchpad.net/~emitorino/review-tools/+git/review-tools/+merge/403485.

[Paulo Flabiano Smorigo (pfsmorigo)]

LGTM

[Alex Murray (alexmurray)]

LGTM!

review: Approve

diff --git a/reviewtools/store.py b/reviewtools/store.py
index 3e27b4e..e6fb87b 100644
--- a/reviewtools/store.py
+++ b/reviewtools/store.py
@@ -471,6 +471,13 @@ def get_packages_from_rock_manifest_section(d, manifest_section, package_type):
             binary_pkg = pkg_info[0].split("=")
             if len(binary_pkg) == 2:
                 binary_pkg_name = binary_pkg[0]
+                # Since dpkg 1.16.2, the binary name could include and arch qualifier: e.g liblz4-1:amd64
+                # For now we assume that if the colon is present, we are in a situation where the binary name is
+                # including the arch. We could assert valid architectures as well but that means this code should be
+                # updated as new arch are supported or even existing ones are removed.
+                arch_qualifier_parts = binary_pkg_name.split(":")
+                if len(arch_qualifier_parts) == 2:
+                    binary_pkg_name = arch_qualifier_parts[0]
                 ver = binary_pkg[1]
                 if binary_pkg_name in update_binaries_ignore:
                     debug("Skipping ignored binary: '%s'" % binary_pkg_name)
@@ -544,7 +551,6 @@ def get_secnots_for_manifest(
         raise ValueError("'%s' not found in security notification database" % rel)
 
     pending_secnots = {}
-
     if stage_and_build_pkgs is None:
         debug("no stage-packages found")
         return pending_secnots
diff --git a/reviewtools/tests/test_store.py b/reviewtools/tests/test_store.py
index 79a0156..a86d1b2 100644
--- a/reviewtools/tests/test_store.py
+++ b/reviewtools/tests/test_store.py
@@ -767,6 +767,7 @@ class TestStore(TestCase):
             "apt": "2.0.2ubuntu0.2",
             "bsdutils": "1:2.34-0.1ubuntu9.1",
             "libxcursor1": "1.0.0-2ubuntu1",
+            "libcurl4": "7.74.0-1ubuntu2.1",
         }
         for pkg_name in expected_stage_packages:
             self.assertIn(pkg_name, res["staged"])
diff --git a/tests/test-rocks-store-unittest-1.db b/tests/test-rocks-store-unittest-1.db
index f6934da..d256a61 100644
--- a/tests/test-rocks-store-unittest-1.db
+++ b/tests/test-rocks-store-unittest-1.db
@@ -11,7 +11,7 @@
           "edge",
           "beta"
         ],
-        "manifest_yaml": "manifest-version: '1'\nname: redis\nos-release-id: ubuntu\nos-release-version-id: '20.04'\narchitectures: \n- amd64\nstage-packages: \n    - adduser=3.118ubuntu2,adduser=3.118ubuntu2\n    - apt=2.0.2ubuntu0.2,apt=2.0.2ubuntu0.2\n    - bsdutils=1:2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1\n    - libxcursor1=1.0.0-2ubuntu1,tiff=1.0.0-2ubuntu1\n",
+        "manifest_yaml": "manifest-version: '1'\nname: redis\nos-release-id: ubuntu\nos-release-version-id: '20.04'\narchitectures: \n- amd64\nstage-packages: \n    - adduser=3.118ubuntu2,adduser=3.118ubuntu2\n    - apt=2.0.2ubuntu0.2,apt=2.0.2ubuntu0.2\n    - bsdutils=1:2.34-0.1ubuntu9.1,util-linux=2.34-0.1ubuntu9.1\n    - libxcursor1=1.0.0-2ubuntu1,tiff=1.0.0-2ubuntu1\n    - libcurl4:amd64=7.74.0-1ubuntu2.1,curl=7.74.0-1ubuntu2.1\n",
         "version": "5.0-20.04",
         "revision": "852f7702e973",
         "architectures": [