1 |
commit: c310e44692ad91777c71394dda97cd1f33f72589 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 4 23:43:05 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 4 23:48:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c310e446 |
7 |
|
8 |
metadata/install-qa-check.d: don't fail if has_version died |
9 |
|
10 |
During Python target migrations, if portage[-ipc], portageq can't |
11 |
be invoked as a binary (which has_version does behind the scenes w/ -ipc), |
12 |
so just call it w/ nonfatal, to avoid aborting the emerge and possibly |
13 |
hurting the system (imagine python-exec gets upgraded but portage |
14 |
wasn't yet). |
15 |
|
16 |
Fails like: |
17 |
``` |
18 |
|
19 |
${EPREFIX}/Gentoo/usr/lib/python-exec/python3.9/portageq: this Python implementation (python3.9) is not supported by the script. |
20 |
* ERROR: app-admin/perl-cleaner-2.30::gentoo_prefix failed: |
21 |
* has_version: unexpected portageq exit code: 127 |
22 |
* |
23 |
* Call stack: |
24 |
* misc-functions.sh, line 1334: Called install_qa_check |
25 |
* misc-functions.sh, line 138: Called source 'install_symlink_html_docs' |
26 |
* 60python-pyc, line 118: Called python_pyc_check |
27 |
* 60python-pyc, line 22: Called has_version 'install_hooks' |
28 |
* phase-helpers.sh, line 986: Called ___best_version_and_has_version_common '${EPREFIX}/Gentoo/var/db/repos/gentoo/metadata/install-qa-check.d/60python-pyc' |
29 |
* phase-helpers.sh, line 973: Called die |
30 |
* The specific snippet of code: |
31 |
* die "${FUNCNAME[1]}: unexpected portageq exit code: ${retval}" |
32 |
``` |
33 |
|
34 |
Bug: https://bugs.gentoo.org/778014 |
35 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
36 |
|
37 |
metadata/install-qa-check.d/60python-pyc | 2 +- |
38 |
1 file changed, 1 insertion(+), 1 deletion(-) |
39 |
|
40 |
diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-pyc |
41 |
index 4679070328c0..fdd232422880 100644 |
42 |
--- a/metadata/install-qa-check.d/60python-pyc |
43 |
+++ b/metadata/install-qa-check.d/60python-pyc |
44 |
@@ -19,7 +19,7 @@ python_pyc_check() { |
45 |
# Avoid running the check if sufficiently new gpep517 is not installed |
46 |
# yet. It's valid to schedule (for merge order) >=gpep517-8 after |
47 |
# packages which have this check run if they don't use distutils-r1. |
48 |
- has_version ">=dev-python/gpep517-8" || return |
49 |
+ nonfatal has_version ">=dev-python/gpep517-8" || return |
50 |
|
51 |
for prog in "${progs[@]}"; do |
52 |
local impl=${prog%/*} |