From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6C78D138BED for ; Sun, 18 Oct 2015 11:24:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7831421C074; Sun, 18 Oct 2015 11:24:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 181AE21C074 for ; Sun, 18 Oct 2015 11:24:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01E77340685 for ; Sun, 18 Oct 2015 11:24:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 608ED12A0 for ; Sun, 18 Oct 2015 11:24:50 +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: <1445167354.c8afd4a44f0bae300ef21e5873ed0c984d8e2240.ulm@gentoo> Subject: [gentoo-commits] proj/pms:eapi-6 commit in: / X-VCS-Repository: proj/pms X-VCS-Files: pkg-mgr-commands.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c8afd4a44f0bae300ef21e5873ed0c984d8e2240 X-VCS-Branch: eapi-6 Date: Sun, 18 Oct 2015 11:24:50 +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: 10b9234b-6cf9-47d1-a4a9-9b175912abcb X-Archives-Hash: 56037fbe8e0fbee5f36f9b3a13ecfa5b commit: c8afd4a44f0bae300ef21e5873ed0c984d8e2240 Author: Ulrich Müller gentoo org> AuthorDate: Fri Oct 16 15:54:53 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Oct 18 11:22:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=c8afd4a4 EAPI 6: Fix eapply algorithm. pkg-mgr-commands.tex | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 22623a7..1e7b8cf 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -173,19 +173,25 @@ Ebuilds must not run any of these commands once the current phase function has r \STATE collect all parameters beginning with a hyphen in the \t{options} array \STATE collect all remaining parameters in the \t{files} array \ENDIF +\IF{the \t{files} array is empty} + \STATE abort the build process with an error +\ENDIF \FORALL{\t{x} in the \t{files} array} \IF{\t{\$x} is a directory} + \IF{\NOT any files match \t{\$x/*.diff} or \t{\$x/*.patch}} + \STATE abort the build process with an error + \ENDIF \FORALL{files \t{f} matching \t{\$x/*.diff} or \t{\$x/*.patch}, sorted in POSIX locale} \STATE call \t{patch -p1 -f -g0 -{}-no-backup-if-mismatch "\$\{options[@]\}" < "\$f"} \IF{child process returned with non-zero exit status} - \STATE return immediately with an error + \STATE return immediately with that error status \ENDIF \ENDFOR \ELSE \STATE call \t{patch -p1 -f -g0 -{}-no-backup-if-mismatch "\$\{options[@]\}" < "\$x"} \IF{child process returned with non-zero exit status} - \STATE return immediately with an error + \STATE return immediately with that error status \ENDIF \ENDIF \ENDFOR