commit:     01d06eb1d9dc8c4b16cbc9a6567ed0c07df5901a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 02:45:58 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 03:28:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=01d06eb1

Fix python 3.9 CI jobs since 92ff02b9189f

Use emerge -e to fix this error we've seen since
92ff02b9189f for python 3.9 CI jobs:

https://github.com/gentoo/portage/actions/runs/8014796128/job/21893963019

test_portage_baseline[binhost emerge-gpkg] - AssertionError: 'emerge' failed 
with args '('-e', '--getbinpkgonly', 'dev-libs/A')'

emerge: there are no binary packages to satisfy "dev-libs/B[flag]".
(dependency required by "dev-libs/A-1::test_repo" [binary])
(dependency required by "dev-libs/A" [argument])

Fixes: 92ff02b9189f ("emerge: Skip installed packages with emptytree in 
depgraph selection")
Bug: https://bugs.gentoo.org/651018
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/tests/emerge/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/tests/emerge/conftest.py 
b/lib/portage/tests/emerge/conftest.py
index d9aec7041e..580d1e09ab 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -805,7 +805,7 @@ def _generate_all_baseline_commands(playground, binhost):
         test_commands["binhost emerge"] = Noop()
     else:
         # The next emerge has been added to split this test from the rest:
-        make_package = Emerge("--buildpkg", "dev-libs/A")
+        make_package = Emerge("-e", "--buildpkg", "dev-libs/A")
         getbinpkgonly = Emerge(
             "-e",
             "--getbinpkgonly",

Reply via email to