Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys-apps/portage: backport message fix #31891

Closed
wants to merge 1 commit into from
Closed

sys-apps/portage: backport message fix #31891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 43 additions & 0 deletions sys-apps/portage/files/depgraph.py-fix-no-ebuilds-binpkgs-message.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From b199d0307b47f9fb06dbe533d7e24926a561c238 Mon Sep 17 00:00:00 2001
From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Date: Sun, 9 Jul 2023 00:08:27 -0500
Subject: [PATCH] depgraph.py: fix "no ebuilds/binpkgs" message

The "there are no binary packages to satisfy" was being unconditionally
output for packages that could not be found. Fix the logic for choosing
between the "binary packages" and "ebuilds" form of the message.

This is a temporary stopgap as alluded to by me in the bug, but the
tl;dr is that some entries in the `myopts` dict have "y"/"n" values
whereas some are True/unset, and this discrepancy should be sorted out.

[sam: Add NEWS and Fixes, although the change in that commit _shouldn't_
have been wrong, it is because of a quirk for now...]

[oskari: remove NEWS for backport]

Bug: https://bugs.gentoo.org/909853
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Closes: https://github.com/gentoo/portage/pull/1065
Fixes: 0b21a5a392bd84c07b94373991f59108fbe98516
Signed-off-by: Sam James <sam@gentoo.org>
---
lib/_emerge/depgraph.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index a36ab6351..1aeae6257 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -6456,7 +6456,7 @@ class depgraph:
cp_exists = True
break

- if self._frozen_config.myopts.get("--usepkgonly", "y"):
+ if self._frozen_config.myopts.get("--usepkgonly", False):
writemsg(
f"\nemerge: there are no binary packages to satisfy {green(xinfo)}.\n",
noiselevel=-1,
--
2.41.0

5 changes: 5 additions & 0 deletions sys-apps/portage/portage-3.0.48.1-r1.ebuild → sys-apps/portage/portage-3.0.48.1-r2.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ PDEPEND="
)
"

# message patch used in 3.0.48.1 and 3.0.49 (bug 909853)
PATCHES=(
"${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch"
)

distutils_enable_tests pytest

pkg_pretend() {
Expand Down
5 changes: 5 additions & 0 deletions sys-apps/portage/portage-3.0.49.ebuild → sys-apps/portage/portage-3.0.49-r1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ PDEPEND="
)
"

# message patch used in 3.0.48.1 and 3.0.49 (bug 909853)
PATCHES=(
"${FILESDIR}/depgraph.py-fix-no-ebuilds-binpkgs-message.patch"
)

distutils_enable_tests pytest

pkg_pretend() {
Expand Down