repo: return list of pkgs for multiple __getitem__() matches

Author: radhermit

src/pkgcraft/repo/base.pyx

@@ -106,10 +106,11 @@ cdef class Repo:
         return bool(next(self.iter(obj), None))
 
     def __getitem__(self, object obj not None):
-        try:
-            return next(self.iter(obj))
-        except StopIteration:
-            raise KeyError(obj)
+        if pkgs := list(self.iter(obj)):
+            if len(pkgs) > 1:
+                return pkgs
+            return pkgs[0]
+        raise KeyError(obj)
 
     def __iter__(self):
         return _Iter.create(self)

src/pkgcraft/repo/set.pyx

@@ -52,11 +52,12 @@ cdef class RepoSet:
             if repo := next(matching_repos, None):
                 return repo
 
-        # try to return the first pkg match from a restriction
-        try:
-            return next(self.iter(key))
-        except StopIteration:
-            raise KeyError(key)
+        # try to return the pkgs matching a restriction
+        if pkgs := list(self.iter(key)):
+            if len(pkgs) > 1:
+                return pkgs
+            return pkgs[0]
+        raise KeyError(key)
 
     def iter(self, restrict=None):
         """Iterate over a repo set's packages, optionally applying a restriction."""

tests/repo/base.py

@@ -107,13 +107,15 @@ def test_contains_base(self, make_repo):
                 assert obj in r1
 
     def test_getitem_base(self, repo):
-        pkg = repo.create_pkg("cat/pkg-1")
-        assert pkg == repo["cat/pkg-1"]
-        assert pkg == repo[Cpv("cat/pkg-1")]
-        assert pkg == repo[Dep("=cat/pkg-1")]
-        assert pkg == repo[Dep(">=cat/pkg-1")]
+        pkg1 = repo.create_pkg("cat/pkg-1")
+        pkg2 = repo.create_pkg("cat/pkg-2")
+        assert pkg1 == repo["cat/pkg-1"]
+        assert pkg1 == repo[Cpv("cat/pkg-1")]
+        assert pkg1 == repo[Dep("=cat/pkg-1")]
+        assert pkg2 == repo[Dep(">=cat/pkg-2")]
+        assert [pkg1, pkg2] == repo["cat/pkg"]
 
-        for obj in ("cat/pkg-2", Cpv("cat/pkg-3"), Dep("<cat/pkg-1")):
+        for obj in ("cat/pkg-3", Cpv("cat/pkg-3"), Dep("<cat/pkg-1")):
             with pytest.raises(KeyError):
                 _ = repo[obj]
 

tests/repo/test_set.py

@@ -167,8 +167,8 @@ def test_getitem(self, make_fake_repo):
         assert s[:] == s
         assert s[-1] == r2
         assert s["r2"] == r2
-        assert s["cat/pkg"] == pkg
-        assert s["cat/pkg-1"] == pkg
+        assert s["cat/pkg"] == [pkg, pkg1, pkg2]
+        assert s["cat/pkg-1"] == [pkg, pkg1]
         assert s["=cat/pkg-1::r2"] == pkg1
         assert s[Dep("=cat/pkg-1::r2")] == pkg1
         assert s["cat/pkg-2"] == pkg2