diff options
| author |   Oskari Pirhonen <xxc3ncoredxx@gmail.com> | 2023-07-09 00:08:27 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-07-09 07:24:28 +0100 |
| commit | b199d0307b47f9fb06dbe533d7e24926a561c238 (patch) | |
| tree | f3d211087ea16ffca5be4a7c2c71d98d609e377d | |
| parent | sr.ht ci: install pytest (diff) | |
| download | portage-b199d0307b47f9fb06dbe533d7e24926a561c238.tar.gz portage-b199d0307b47f9fb06dbe533d7e24926a561c238.tar.bz2 portage-b199d0307b47f9fb06dbe533d7e24926a561c238.zip | |
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...]
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>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/_emerge/depgraph.py | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -5,6 +5,9 @@ Bug fixes: * install-qa-check.d/05prefix: Fix prefixifying shebang for >= EAPI 7 ebuilds (bug #909147). +* emerge: Fix 'no ebuilds available' message always mentioning binpkgs + (bug #909853). + * gpkg: Fix timestamp for binary packages (bug #909067). portage-3.0.49 (2023-06-21) 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, |