commit: 38cf0e0080ba3e396c0e95a91d103e279fed8c52
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 18 02:16:55 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 18 02:16:55 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=38cf0e00
Fix 'pruned' typo in function names
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/package/ebuild/_config/LicenseManager.py | 2 +-
lib/portage/package/ebuild/config.py | 2 +-
lib/portage/tests/ebuild/test_config.py | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/portage/package/ebuild/_config/LicenseManager.py
b/lib/portage/package/ebuild/_config/LicenseManager.py
index 1b9bf665dd..6d87d55233 100644
--- a/lib/portage/package/ebuild/_config/LicenseManager.py
+++ b/lib/portage/package/ebuild/_config/LicenseManager.py
@@ -136,7 +136,7 @@ class LicenseManager:
accept_license.extend(x)
return accept_license
- def get_prunned_accept_license(self, cpv, use, lic, slot, repo):
+ def get_pruned_accept_license(self, cpv, use, lic, slot, repo):
"""
Generate a pruned version of ACCEPT_LICENSE, by intersection with
LICENSE. This is required since otherwise ACCEPT_LICENSE might be
diff --git a/lib/portage/package/ebuild/config.py
b/lib/portage/package/ebuild/config.py
index 718f367eb2..55f87d3c5e 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1676,7 +1676,7 @@ class config:
use = frozenset(settings["PORTAGE_USE"].split())
values["ACCEPT_LICENSE"] = (
- settings._license_manager.get_prunned_accept_license(
+ settings._license_manager.get_pruned_accept_license(
settings.mycpv,
use,
settings.get("LICENSE", ""),
diff --git a/lib/portage/tests/ebuild/test_config.py
b/lib/portage/tests/ebuild/test_config.py
index 1b436c2dfe..b219c4b8f0 100644
--- a/lib/portage/tests/ebuild/test_config.py
+++ b/lib/portage/tests/ebuild/test_config.py
@@ -116,25 +116,25 @@ class ConfigTestCase(TestCase):
)
self.assertEqual(
- lic_man.get_prunned_accept_license("dev-libs/B-1", [], "TEST",
"0", None),
+ lic_man.get_pruned_accept_license("dev-libs/B-1", [], "TEST", "0",
None),
"TEST",
)
self.assertEqual(
- lic_man.get_prunned_accept_license("dev-libs/A-1", [], "-TEST2",
"0", None),
+ lic_man.get_pruned_accept_license("dev-libs/A-1", [], "-TEST2",
"0", None),
"",
)
self.assertEqual(
- lic_man.get_prunned_accept_license(
+ lic_man.get_pruned_accept_license(
"dev-libs/A-2", [], "|| ( TEST TEST2 )", "0", None
),
"TEST",
)
self.assertEqual(
- lic_man.get_prunned_accept_license("dev-libs/C-1", [], "TEST5",
"0", None),
+ lic_man.get_pruned_accept_license("dev-libs/C-1", [], "TEST5",
"0", None),
"TEST5",
)
self.assertEqual(
- lic_man.get_prunned_accept_license("dev-libs/C-2", [], "TEST2",
"0", None),
+ lic_man.get_pruned_accept_license("dev-libs/C-2", [], "TEST2",
"0", None),
"",
)
