From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1425292-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AF585158094
for <garchives@archives.gentoo.org>; Thu, 4 Aug 2022 23:49:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 854D5E0DD8;
Thu, 4 Aug 2022 23:49:49 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 54114E0DD8
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Aug 2022 23:49:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5BD4F3411B9
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Aug 2022 23:49:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A300E562
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Aug 2022 23:49:46 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1659656937.c310e44692ad91777c71394dda97cd1f33f72589.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/
X-VCS-Repository: repo/gentoo
X-VCS-Files: metadata/install-qa-check.d/60python-pyc
X-VCS-Directories: metadata/install-qa-check.d/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c310e44692ad91777c71394dda97cd1f33f72589
X-VCS-Branch: master
Date: Thu, 4 Aug 2022 23:49:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e8e3e7cf-b12c-4d69-bb89-49bcf6612fec
X-Archives-Hash: ea5c96d9558164da24bb46b4e13e23fd
commit: c310e44692ad91777c71394dda97cd1f33f72589
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 4 23:43:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 4 23:48:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c310e446
metadata/install-qa-check.d: don't fail if has_version died
During Python target migrations, if portage[-ipc], portageq can't
be invoked as a binary (which has_version does behind the scenes w/ -ipc),
so just call it w/ nonfatal, to avoid aborting the emerge and possibly
hurting the system (imagine python-exec gets upgraded but portage
wasn't yet).
Fails like:
```
${EPREFIX}/Gentoo/usr/lib/python-exec/python3.9/portageq: this Python implementation (python3.9) is not supported by the script.
* ERROR: app-admin/perl-cleaner-2.30::gentoo_prefix failed:
* has_version: unexpected portageq exit code: 127
*
* Call stack:
* misc-functions.sh, line 1334: Called install_qa_check
* misc-functions.sh, line 138: Called source 'install_symlink_html_docs'
* 60python-pyc, line 118: Called python_pyc_check
* 60python-pyc, line 22: Called has_version 'install_hooks'
* 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'
* phase-helpers.sh, line 973: Called die
* The specific snippet of code:
* die "${FUNCNAME[1]}: unexpected portageq exit code: ${retval}"
```
Bug: https://bugs.gentoo.org/778014
Signed-off-by: Sam James <sam <AT> gentoo.org>
metadata/install-qa-check.d/60python-pyc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-pyc
index 4679070328c0..fdd232422880 100644
--- a/metadata/install-qa-check.d/60python-pyc
+++ b/metadata/install-qa-check.d/60python-pyc
@@ -19,7 +19,7 @@ python_pyc_check() {
# Avoid running the check if sufficiently new gpep517 is not installed
# yet. It's valid to schedule (for merge order) >=gpep517-8 after
# packages which have this check run if they don't use distutils-r1.
- has_version ">=dev-python/gpep517-8" || return
+ nonfatal has_version ">=dev-python/gpep517-8" || return
for prog in "${progs[@]}"; do
local impl=${prog%/*}