From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED48F1396D0 for ; Mon, 9 Oct 2017 17:31:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73B392BC01D; Mon, 9 Oct 2017 17:31:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F9A3E0E33 for ; Mon, 9 Oct 2017 17:31:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4233A3406D1 for ; Mon, 9 Oct 2017 17:31:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 350C090B1 for ; Mon, 9 Oct 2017 17:31:11 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1507569610.cc8a6a3b9cf0cddf08081c9fe169ccc4a0d60374.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-7 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: eapi-differences.tex pkg-mgr-commands.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: cc8a6a3b9cf0cddf08081c9fe169ccc4a0d60374 X-VCS-Branch: eapi-7 Date: Mon, 9 Oct 2017 17:31:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0bdcd4dc-9de6-4422-9ada-f7d995be1974 X-Archives-Hash: 9bc81163c9728ab7fab0eb716c51003b commit: cc8a6a3b9cf0cddf08081c9fe169ccc4a0d60374 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 29 14:24:10 2017 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Oct 9 17:20:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=cc8a6a3b EAPI 7 provides command fallback for nonfatal. Bug: https://bugs.gentoo.org/622894 eapi-differences.tex | 5 +++++ pkg-mgr-commands.tex | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 5bd7836..1a137a0 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. \bottomrule \endlastfoot +\t{nonfatal} function+command & \compactfeatureref{nonfatal-fallback} & + No & No & No & No & Yes \\ + \t{domo} install path & \compactfeatureref{domo-path} & \t{\$\{DESTTREE\}\slash share\slash locale} & \t{\$\{DESTTREE\}\slash share\slash locale} & @@ -454,6 +457,8 @@ EAPI 7 is EAPI 6 with the following changes: \item \t{ECLASSDIR} removed, \featureref{eclassdir}. \item \t{domo} installs to \t{/usr/share/locale}, ignoring \t{into}, \featureref{domo-path}. \item \t{dolib} and \t{libopts} banned, \featureref{banned-commands}. +\item \t{nonfatal} defined both as a shell function and external command, + \featureref{nonfatal-fallback}. \end{compactitem} \ChangeWhenAddingAnEAPI{7} diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 35ec54e..02d987e 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -22,6 +22,11 @@ The following commands affect this behaviour: the build process due to a failure, instead a non-zero exit status shall be returned. Only in EAPIs listed in table~\ref{tab:commands-die-table} as supporting \t{nonfatal}. + \featurelabel{nonfatal-fallback} In EAPIs listed in table~\ref{tab:commands-die-table} + as having \t{nonfatal} defined as both function and external command, the package manager must + provide both implementations to account both for calling in ebuild scope directly, and via + \t{xargs}. + Explicit \t{die} or \t{assert} commands only respect \t{nonfatal} when called with the \t{-n} option and in EAPIs supporting this option, see table~\ref{tab:nonfatal-die}. \end{description} @@ -29,14 +34,16 @@ The following commands affect this behaviour: \ChangeWhenAddingAnEAPI{7} \begin{centertable}{EAPI command failure behaviour} \label{tab:commands-die-table} - \begin{tabular}{lll} + \begin{tabular}{llll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & - \multicolumn{1}{c}{\textbf{Command failure behaviour}} & - \multicolumn{1}{c}{\textbf{Supports \t{nonfatal}?}} \\ + \multicolumn{1}{P{8em}}{\textbf{Command failure behaviour}} & + \multicolumn{1}{P{6em}}{\textbf{Supports \t{nonfatal}?}} & + \multicolumn{1}{P{12em}}{\textbf{\t{nonfatal} as both function and external command?}} \\ \midrule - 0, 1, 2, 3 & Non-zero exit & No \\ - 4, 5, 6, 7 & Aborts & Yes \\ + 0, 1, 2, 3 & Non-zero exit & No & n/a \\ + 4, 5, 6 & Aborts & Yes & No \\ + 7 & Aborts & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable}