parent
c3630a85ed
commit
4495c329ba
@ -0,0 +1,2 @@
|
||||
Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
|
||||
for a recovery guide for a broken portage installation.
|
@ -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
|
||||
|
@ -0,0 +1,29 @@
|
||||
https://gitweb.gentoo.org/proj/portage.git/commit/?id=6066bb766f43ca06a5b0f08baa5946ff678f0c29
|
||||
|
||||
From 6066bb766f43ca06a5b0f08baa5946ff678f0c29 Mon Sep 17 00:00:00 2001
|
||||
From: Benda Xu <orv@debian.org>
|
||||
Date: Sun, 25 Jun 2023 17:03:00 +0800
|
||||
Subject: bin/install-qa-check.d/05prefix: prefixify init-script shebangs.
|
||||
|
||||
Init scripts in /etc/init.d have OpenRC shebangs "#!/sbin/openrc-run".
|
||||
They should be prefixified like a executable script in a Prefix.
|
||||
|
||||
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
|
||||
Bug: https://bugs.gentoo.org/640658
|
||||
Closes: https://github.com/gentoo/portage/pull/1061
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/bin/install-qa-check.d/05prefix
|
||||
+++ b/bin/install-qa-check.d/05prefix
|
||||
@@ -76,8 +76,8 @@ install_qa_check_prefix() {
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
- # unprefixed shebang, is the script directly in ${PATH}?
|
||||
- if [[ ":${PATH}:" == *":${fp}:"* ]] ; then
|
||||
+ # unprefixed shebang, is the script directly in ${PATH} or an init script?
|
||||
+ if [[ ":${PATH}:${EPREFIX}/etc/init.d:" == *":${fp}:"* ]] ; then
|
||||
if [[ -e ${EROOT}${line[0]} || -e ${ED}${line[0]} ]] ; then
|
||||
# is it unprefixed, but we can just fix it because a
|
||||
# prefixed variant exists
|
||||
--
|
||||
cgit v1.2.3-18-g5258
|
@ -0,0 +1,2 @@
|
||||
# Prevent ccache files from being cleaned
|
||||
x /var/tmp/ccache
|
@ -0,0 +1,2 @@
|
||||
d /var/tmp/portage 0775 portage portage
|
||||
d /tmp/portage 0775 portage portage
|
Loading…
Reference in new issue