aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGábor Oszkár Dénes <gaboroszkar@protonmail.com>2024-02-14 18:40:24 +0100
committerSam James <sam@gentoo.org>2024-02-23 04:39:26 +0000
commit92ff02b9189f8350f44e134d538319e4037f3f71 (patch)
tree10cbb64f516adf8aead9b072cc0d9a9673c39dc7 /lib
parentsocks5: Use real asyncio.run (diff)
downloadportage-92ff02b9189f8350f44e134d538319e4037f3f71.tar.gz
portage-92ff02b9189f8350f44e134d538319e4037f3f71.tar.bz2
portage-92ff02b9189f8350f44e134d538319e4037f3f71.zip
emerge: Skip installed packages with emptytree in depgraph selection
Running emerge with emptytree tries to find the best match for every atom it needs to install. Sometimes the best matches would be already installed packages (with `operation=nomerge`), but these packages would be silently skipped with full emptytree installation. This change makes sure that emerge attempts to install every package. If the package has unmet requirements, emerge will complain. Bug: https://bugs.gentoo.org/651018 Signed-off-by: Gábor Oszkár Dénes <gaboroszkar@protonmail.com> Closes: https://github.com/gentoo/portage/pull/1272 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/_emerge/depgraph.py13
-rw-r--r--lib/portage/tests/resolver/test_depth.py8
-rw-r--r--lib/portage/tests/resolver/test_emptytree_reinstall_unsatisfiability.py137
-rw-r--r--lib/portage/tests/resolver/test_useflags.py6
4 files changed, 160 insertions, 4 deletions
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 70b83ee1f..ea96bd58c 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -7640,6 +7640,19 @@ class depgraph:
continue
if (
+ empty
+ and pkg.installed
+ and not self._frozen_config.excluded_pkgs.findAtomForPackage(
+ pkg, modified_use=self._pkg_use_enabled(pkg)
+ )
+ ):
+ # With --emptytree option we assume no packages
+ # are installed, so we do not select them.
+ # But we allow installed packages to satisfy dependency requirements
+ # if they're explicitly excluded, so we allow them to be selected.
+ continue
+
+ if (
not pkg.installed
and self._frozen_config.excluded_pkgs.findAtomForPackage(
pkg, modified_use=self._pkg_use_enabled(pkg)
diff --git a/lib/portage/tests/resolver/test_depth.py b/lib/portage/tests/resolver/test_depth.py
index 9c5289f7d..ab5f8e7ec 100644
--- a/lib/portage/tests/resolver/test_depth.py
+++ b/lib/portage/tests/resolver/test_depth.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from portage.tests import TestCase
@@ -318,6 +318,12 @@ class ResolverDepthTestCase(TestCase):
"sys-fs/udev-164",
],
),
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options={"--emptytree": True, "--exclude": ["dev-libs/B"]},
+ success=True,
+ mergelist=["dev-libs/C-2", "dev-libs/A-2"],
+ ),
)
playground = ResolverPlayground(
diff --git a/lib/portage/tests/resolver/test_emptytree_reinstall_unsatisfiability.py b/lib/portage/tests/resolver/test_emptytree_reinstall_unsatisfiability.py
new file mode 100644
index 000000000..fcdc01d7f
--- /dev/null
+++ b/lib/portage/tests/resolver/test_emptytree_reinstall_unsatisfiability.py
@@ -0,0 +1,137 @@
+# Copyright 2024 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (
+ ResolverPlayground,
+ ResolverPlaygroundTestCase,
+)
+
+
+class EmptytreeReinstallUnsatisfiabilityTestCase(TestCase):
+ def testEmptytreeReinstallUnsatisfiability(self):
+ """
+ Tests to check if emerge fails and complains when --emptytree
+ package dependency graph reinstall is unsatisfied, even if the already
+ installed packages successfully satisfy the dependency tree.
+
+ See bug #651018 where emerge silently skips package
+ reinstalls because of unsatisfied use flag requirements.
+ """
+ ebuilds = {
+ "dev-libs/A-1": {
+ "DEPEND": "dev-libs/B",
+ "RDEPEND": "dev-libs/B",
+ "EAPI": "2",
+ },
+ "dev-libs/B-1": {
+ "DEPEND": "dev-libs/C[foo]",
+ "RDEPEND": "dev-libs/C[foo]",
+ "EAPI": "2",
+ },
+ "dev-libs/C-1": {
+ "IUSE": "foo",
+ "EAPI": "2",
+ },
+ "dev-libs/X-1": {
+ "DEPEND": "dev-libs/Y[-baz]",
+ "RDEPEND": "dev-libs/Y[-baz]",
+ "EAPI": "2",
+ },
+ "dev-libs/Y-1": {
+ "IUSE": "baz",
+ "EAPI": "2",
+ },
+ "dev-libs/Z-1": {
+ "DEPEND": "dev-libs/W",
+ "RDEPEND": "dev-libs/W",
+ "EAPI": "2",
+ },
+ "dev-libs/W-1": {
+ "EAPI": "2",
+ },
+ }
+
+ installed = {
+ "dev-libs/A-1": {
+ "DEPEND": "dev-libs/B",
+ "RDEPEND": "dev-libs/B",
+ "EAPI": "2",
+ },
+ "dev-libs/B-1": {
+ "DEPEND": "dev-libs/C[foo]",
+ "RDEPEND": "dev-libs/C[foo]",
+ "EAPI": "2",
+ },
+ "dev-libs/C-1": {
+ "IUSE": "foo",
+ "USE": "foo",
+ "EAPI": "2",
+ },
+ "dev-libs/X-1": {
+ "DEPEND": "dev-libs/Y[-baz]",
+ "RDEPEND": "dev-libs/Y[-baz]",
+ "EAPI": "2",
+ },
+ "dev-libs/Y-1": {
+ "IUSE": "baz",
+ "USE": "-baz",
+ "EAPI": "2",
+ },
+ "dev-libs/Z-1": {
+ "DEPEND": "dev-libs/W",
+ "RDEPEND": "dev-libs/W",
+ "EAPI": "2",
+ },
+ "dev-libs/W-1": {
+ "EAPI": "2",
+ },
+ }
+
+ user_config = {
+ "package.use": ("dev-libs/Y baz",),
+ "package.mask": ("dev-libs/W",),
+ }
+
+ world = ["dev-libs/X"]
+
+ test_cases = (
+ ResolverPlaygroundTestCase(
+ ["dev-libs/A"],
+ options={"--emptytree": True},
+ success=False,
+ mergelist=["dev-libs/C-1", "dev-libs/B-1", "dev-libs/A-1"],
+ use_changes={"dev-libs/C-1": {"foo": True}},
+ ),
+ ResolverPlaygroundTestCase(
+ ["dev-libs/A"],
+ options={"--emptytree": True, "--exclude": ["dev-libs/C"]},
+ success=True,
+ mergelist=["dev-libs/B-1", "dev-libs/A-1"],
+ ),
+ ResolverPlaygroundTestCase(
+ ["@world"],
+ options={"--emptytree": True},
+ success=False,
+ mergelist=["dev-libs/Y-1", "dev-libs/X-1"],
+ use_changes={"dev-libs/Y-1": {"baz": False}},
+ ),
+ ResolverPlaygroundTestCase(
+ ["dev-libs/Z"],
+ options={"--emptytree": True},
+ success=False,
+ ),
+ )
+
+ playground = ResolverPlayground(
+ ebuilds=ebuilds,
+ installed=installed,
+ user_config=user_config,
+ world=world,
+ )
+ try:
+ for test_case in test_cases:
+ playground.run_TestCase(test_case)
+ self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+ finally:
+ playground.cleanup()
diff --git a/lib/portage/tests/resolver/test_useflags.py b/lib/portage/tests/resolver/test_useflags.py
index 86684f7f2..142a31c7f 100644
--- a/lib/portage/tests/resolver/test_useflags.py
+++ b/lib/portage/tests/resolver/test_useflags.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Gentoo Foundation
+# Copyright 2014-2024 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import sys
@@ -292,8 +292,8 @@ class UseFlagsTestCase(TestCase):
"--usepkg": True,
},
success=False,
- mergelist=["[binary]dev-libs/A-2", "dev-libs/B-1"],
- slot_collision_solutions=[],
+ mergelist=None,
+ slot_collision_solutions=None,
),
)